From 9458d49aa8557f4ee16cd8af2d3bf7c90e84ee67 Mon Sep 17 00:00:00 2001
From: Oliver Neukum <oliver@neukum.org>
Date: Tue, 21 Jul 2009 08:47:34 +0200
Subject: [PATCH] --- yaml --- r: 164975 b: refs/heads/master c:
 81e5b23cd206d46d4872d25f3d7ff67a0f355c71 h: refs/heads/master i:   164973:
 937b76c6d7486b1b97d0cf6b8d366df17f5ee19c   164971:
 477f5d9170e40b734aaa118da5c16a8544ce4f80   164967:
 a1d80bad6c44375e1a7c37979d2a924c8ef4ae15   164959:
 f723d695ff5a773220ae2eeff1ba4f5209d66000 v: v3

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

diff --git a/[refs] b/[refs]
index ab92888805eb..126cd73af45c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 807fcb5e19877d339a4cc56f2c6ddaf3a147457a
+refs/heads/master: 81e5b23cd206d46d4872d25f3d7ff67a0f355c71
diff --git a/trunk/drivers/usb/serial/usb-serial.c b/trunk/drivers/usb/serial/usb-serial.c
index 54bb37d41916..45975b4984ea 100644
--- a/trunk/drivers/usb/serial/usb-serial.c
+++ b/trunk/drivers/usb/serial/usb-serial.c
@@ -1157,15 +1157,19 @@ int usb_serial_suspend(struct usb_interface *intf, pm_message_t message)
 
 	serial->suspending = 1;
 
+	if (serial->type->suspend) {
+		r = serial->type->suspend(serial, message);
+		if (r < 0)
+			goto err_out;
+	}
+
 	for (i = 0; i < serial->num_ports; ++i) {
 		port = serial->port[i];
 		if (port)
 			kill_traffic(port);
 	}
 
-	if (serial->type->suspend)
-		r = serial->type->suspend(serial, message);
-
+err_out:
 	return r;
 }
 EXPORT_SYMBOL(usb_serial_suspend);