diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-05-10 11:57:33 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-05-10 11:57:33 -0400 |
| commit | 25c4790e725446e5e4eaf500d611fbd4eb071a13 (patch) | |
| tree | 4d19095dec4aaa1ce4b46d6678f36eb7f31e30e6 | |
| parent | 5faaf7eaf5d3609a78b9cb9e40c8beb18ecd653d (diff) | |
| download | longterm-queue-2.6.34-25c4790e725446e5e4eaf500d611fbd4eb071a13.tar.gz | |
add upstream fix for another tty-icount oops
| -rw-r--r-- | queue/series | 1 | ||||
| -rw-r--r-- | queue/tty-fix-warning-in-synclink-driver.patch | 38 |
2 files changed, 39 insertions, 0 deletions
diff --git a/queue/series b/queue/series index 241d53e..4ae50d8 100644 --- a/queue/series +++ b/queue/series @@ -173,4 +173,5 @@ 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 +tty-fix-warning-in-synclink-driver.patch score-fix-off-by-one-index-into-syscall-table.patch diff --git a/queue/tty-fix-warning-in-synclink-driver.patch b/queue/tty-fix-warning-in-synclink-driver.patch new file mode 100644 index 0000000..c631f01 --- /dev/null +++ b/queue/tty-fix-warning-in-synclink-driver.patch @@ -0,0 +1,38 @@ +From 659ccb3c99139321b16abee3bdf4d32770676268 Mon Sep 17 00:00:00 2001 +From: Andres Salomon <dilinger@queued.net> +Date: Tue, 9 Nov 2010 14:10:38 -0800 +Subject: [PATCH] tty: fix warning in synclink driver +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +commit dc98d9650891661a20842a8eef9e76536046d897 upstream. + +During builds I see the following warning - + + CC [M] drivers/char/pcmcia/synclink_cs.o +drivers/char/pcmcia/synclink_cs.c:2194: warning: ‘mgslpc_get_icount’ defined but not used + +The function is a callback meant to be assigned to get_icount (added during 0587102cf). +Fix accordingly. + +Signed-off-by: Andres Salomon <dilinger@queued.net> +Acked-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/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c +index efa810e..bb3977a 100644 +--- a/drivers/char/pcmcia/synclink_cs.c ++++ b/drivers/char/pcmcia/synclink_cs.c +@@ -2839,6 +2839,7 @@ static const struct tty_operations mgslpc_ops = { + .hangup = mgslpc_hangup, + .tiocmget = tiocmget, + .tiocmset = tiocmset, ++ .get_icount = mgslpc_get_icount, + .proc_fops = &mgslpc_proc_fops, + }; + +-- +1.7.9.6 + |