From c15bc442695cbd7b209b7a83be291c6a1dd503cd Mon Sep 17 00:00:00 2001
From: Oliver Neukum <oneukum@suse.de>
Date: Mon, 23 Jul 2007 08:58:39 +0200
Subject: [PATCH] --- yaml --- r: 63198 b: refs/heads/master c:
 e31c18804f584dd838a752f6628e8c15bd7a3372 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 239a19953163..ab568622aea6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 209b3cfd538e7d56d228cf6daf0b27e2cc26c6c2
+refs/heads/master: e31c18804f584dd838a752f6628e8c15bd7a3372
diff --git a/trunk/drivers/usb/serial/usb-serial.c b/trunk/drivers/usb/serial/usb-serial.c
index a3665659d13b..5e1cf78c7786 100644
--- a/trunk/drivers/usb/serial/usb-serial.c
+++ b/trunk/drivers/usb/serial/usb-serial.c
@@ -1077,16 +1077,17 @@ int usb_serial_suspend(struct usb_interface *intf, pm_message_t message)
 	struct usb_serial_port *port;
 	int i, r = 0;
 
-	if (serial) {
-		for (i = 0; i < serial->num_ports; ++i) {
-			port = serial->port[i];
-			if (port)
-				kill_traffic(port);
-		}
+	if (!serial) /* device has been disconnected */
+		return 0;
+
+	for (i = 0; i < serial->num_ports; ++i) {
+		port = serial->port[i];
+		if (port)
+			kill_traffic(port);
 	}
 
 	if (serial->type->suspend)
-		serial->type->suspend(serial, message);
+		r = serial->type->suspend(serial, message);
 
 	return r;
 }