diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-23 15:13:45 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-23 15:13:45 -0700 |
| commit | 252b38ff3752fda675cf69bd7c4fdb68871475c5 (patch) | |
| tree | 1227dcffdfac822941838f51db93e1628e7b62c6 | |
| parent | cb59c123524566899373cced47c068c6afdf570b (diff) | |
| download | patches-252b38ff3752fda675cf69bd7c4fdb68871475c5.tar.gz | |
tty bugfix and an ack for a usb-gadget patch
| -rw-r--r-- | tty/tty-introduce-wait_event_interruptible_tty.patch | 18 | ||||
| -rw-r--r-- | usb.current/usb-gadget-printer-fix-sleep-inside-atomic.patch | 2 |
2 files changed, 17 insertions, 3 deletions
diff --git a/tty/tty-introduce-wait_event_interruptible_tty.patch b/tty/tty-introduce-wait_event_interruptible_tty.patch index 47f854759382de..9ae7196530b725 100644 --- a/tty/tty-introduce-wait_event_interruptible_tty.patch +++ b/tty/tty-introduce-wait_event_interruptible_tty.patch @@ -21,10 +21,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/char/istallion.c | 12 ++++++++---- drivers/char/n_r3964.c | 2 +- drivers/char/tty_port.c | 2 +- - drivers/char/vt_ioctl.c | 2 +- + drivers/char/vt_ioctl.c | 5 ++++- drivers/serial/crisv10.c | 4 ++-- include/linux/tty.h | 42 ++++++++++++++++++++++++++++++++++++++++++ - 7 files changed, 56 insertions(+), 10 deletions(-) + 7 files changed, 59 insertions(+), 10 deletions(-) --- a/drivers/char/cyclades.c +++ b/drivers/char/cyclades.c @@ -119,6 +119,20 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Dequeue it */ spin_lock_irqsave(&vt_event_lock, flags); list_del(&vw->list); +@@ -1761,10 +1761,13 @@ int vt_move_to_console(unsigned int vt, + return -EIO; + } + release_console_sem(); ++ tty_lock(); + if (vt_waitactive(vt + 1)) { + pr_debug("Suspend: Can't switch VCs."); ++ tty_unlock(); + return -EINTR; + } ++ tty_unlock(); + return prev; + } + --- a/drivers/serial/crisv10.c +++ b/drivers/serial/crisv10.c @@ -3981,7 +3981,7 @@ block_til_ready(struct tty_struct *tty, diff --git a/usb.current/usb-gadget-printer-fix-sleep-inside-atomic.patch b/usb.current/usb-gadget-printer-fix-sleep-inside-atomic.patch index 67fc5e5596ec9f..07bf916a2c9011 100644 --- a/usb.current/usb-gadget-printer-fix-sleep-inside-atomic.patch +++ b/usb.current/usb-gadget-printer-fix-sleep-inside-atomic.patch @@ -14,7 +14,7 @@ this is not allowed for spinlocks, switch it to mutex. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: Craig W. Nadler <craig@nadler.us> -Cc: David Brownell <dbrownell@users.sourceforge.net> +Acked-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- |