aboutsummaryrefslogtreecommitdiffstats
path: root/tty
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2009-08-25 22:34:02 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2009-08-25 22:34:02 -0700
commit66577cd1a08a1282db7033198c289c0539536003 (patch)
treea32b233d14c11e600d7e55f9ac0f4dc2f5af7048 /tty
parent1b04639500e142b3e53fb1ff742dfff194e68299 (diff)
downloadpatches-66577cd1a08a1282db7033198c289c0539536003.tar.gz
lots of staging rtxxxx patches and a few others
Diffstat (limited to 'tty')
-rw-r--r--tty/tty-riscom8-fix-shutdown-declaration.patch40
1 files changed, 40 insertions, 0 deletions
diff --git a/tty/tty-riscom8-fix-shutdown-declaration.patch b/tty/tty-riscom8-fix-shutdown-declaration.patch
new file mode 100644
index 00000000000000..ff563bed7cbe10
--- /dev/null
+++ b/tty/tty-riscom8-fix-shutdown-declaration.patch
@@ -0,0 +1,40 @@
+From jirislaby@gmail.com Tue Aug 25 22:11:15 2009
+From: Jiri Slaby <jirislaby@gmail.com>
+Date: Sat, 22 Aug 2009 09:04:42 +0200
+Subject: tty: riscom8, fix shutdown declaration
+To: gregkh@suse.de
+Cc: Jiri Slaby <jirislaby@gmail.com>
+Message-ID: <1250924682-20483-1-git-send-email-jirislaby@gmail.com>
+
+
+tty_port_ops.shutdown takes only one parameter: tty port. Remove
+the second one and use port->tty where needed instead.
+
+Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/char/riscom8.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/char/riscom8.c
++++ b/drivers/char/riscom8.c
+@@ -934,7 +934,7 @@ static void rc_flush_buffer(struct tty_s
+ tty_wakeup(tty);
+ }
+
+-static void rc_close_port(struct tty_port *port, struct tty_struct *tty)
++static void rc_close_port(struct tty_port *port)
+ {
+ unsigned long flags;
+ struct riscom_port *rp = container_of(port, struct riscom_port, port);
+@@ -969,7 +969,7 @@ static void rc_close_port(struct tty_por
+ break;
+ }
+ }
+- rc_shutdown_port(tty, bp, rp);
++ rc_shutdown_port(port->tty, bp, rp);
+ spin_unlock_irqrestore(&riscom_lock, flags);
+ }
+