---

yaml --- r: 151387 b: refs/heads/master c: 568d422 h: refs/heads/master i: 151385: c5d0669 151383: f35134b v: v3
git-mirror · Jun 16, 2009 · 2a0a1b5 · 2a0a1b5
1 parent 471a746
commit 2a0a1b5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 430eb0d27c1b36c5191c16b2472b26137673a8d4
+refs/heads/master: 568d422e9cf52b7b26d2e026ae1617971f62b560
diff --git a/trunk/drivers/usb/serial/generic.c b/trunk/drivers/usb/serial/generic.c
@@ -528,7 +528,7 @@ void usb_serial_generic_unthrottle(struct tty_struct *tty)
 
 int usb_serial_handle_sysrq_char(struct usb_serial_port *port, unsigned int ch)
 {
-	if (port->sysrq) {
+	if (port->sysrq && port->console) {
 		if (ch && time_before(jiffies, port->sysrq)) {
 			handle_sysrq(ch, tty_port_tty_get(&port->port));
 			port->sysrq = 0;