diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-05-10 11:48:49 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-05-10 11:48:49 -0400 |
| commit | 5faaf7eaf5d3609a78b9cb9e40c8beb18ecd653d (patch) | |
| tree | 91c02129027e05cfe48a52308b6804f993651b34 | |
| parent | 24081f007291a9bd1049609292d48c59da0afdbe (diff) | |
| download | longterm-queue-2.6.34-5faaf7eaf5d3609a78b9cb9e40c8beb18ecd653d.tar.gz | |
add warning fix patch needed for tty icount changeover
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/nozomi-Fix-warning-from-the-previous-TIOCGCOUNT-chan.patch | 28 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 29 insertions, 0 deletions
diff --git a/queue/nozomi-Fix-warning-from-the-previous-TIOCGCOUNT-chan.patch b/queue/nozomi-Fix-warning-from-the-previous-TIOCGCOUNT-chan.patch new file mode 100644 index 0000000..3305357 --- /dev/null +++ b/queue/nozomi-Fix-warning-from-the-previous-TIOCGCOUNT-chan.patch @@ -0,0 +1,28 @@ +From 08e9e2d4afb0ad386117298b7c27d0062a9e3cc4 Mon Sep 17 00:00:00 2001 +From: Alan Cox <alan@linux.intel.com> +Date: Tue, 26 Oct 2010 15:56:34 +0100 +Subject: [PATCH] nozomi: Fix warning from the previous TIOCGCOUNT changes + +commit 68e29655cc51761d60d5f27b2738816a5b13e415 upstream. + +Just remove a now unused variable + +Signed-off-by: Alan Cox <alan@linux.intel.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> + +diff --git a/drivers/char/nozomi.c b/drivers/char/nozomi.c +index 0924435..7ecca24 100644 +--- a/drivers/char/nozomi.c ++++ b/drivers/char/nozomi.c +@@ -1829,7 +1829,6 @@ static int ntty_ioctl(struct tty_struct *tty, struct file *file, + unsigned int cmd, unsigned long arg) + { + struct port *port = tty->driver_data; +- void __user *argp = (void __user *)arg; + int rval = -ENOIOCTLCMD; + + DBG1("******** IOCTL, cmd: %d", cmd); +-- +1.7.9.6 + diff --git a/queue/series b/queue/series index 2ea0fac..241d53e 100644 --- a/queue/series +++ b/queue/series @@ -172,4 +172,5 @@ fuse-check-size-of-FUSE_NOTIFY_INVAL_ENTRY-message.patch igb-Fix-lack-of-flush-after-register-write-and-befor.patch tty-Make-tiocgicount-a-handler.patch tty-icount-changeover-for-other-main-devices.patch +nozomi-Fix-warning-from-the-previous-TIOCGCOUNT-chan.patch score-fix-off-by-one-index-into-syscall-table.patch |