From 2a0a1b5c42b4e74b82f73c27a43a30fdd709bc35 Mon Sep 17 00:00:00 2001
From: Jason Wessel <jason.wessel@windriver.com>
Date: Fri, 29 May 2009 13:34:17 -0500
Subject: [PATCH] --- yaml --- r: 151387 b: refs/heads/master c:
 568d422e9cf52b7b26d2e026ae1617971f62b560 h: refs/heads/master i:   151385:
 c5d066913a0babff53b33be565aa0538478678a6   151383:
 f35134b0fef51bcfad06aa14fdc08f0f5bb6f89e v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/usb/serial/generic.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7a5d296c3f7c..88aa2527a4c8 100644
--- 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
index 9fccc26235a2..8dabac1929b0 100644
--- 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;