---

yaml --- r: 164975 b: refs/heads/master c: 81e5b23 h: refs/heads/master i: 164973: 937b76c 164971: 477f5d9 164967: a1d80ba 164959: f723d69 v: v3
git-mirror · Sep 23, 2009 · 9458d49 · 9458d49
1 parent 543f882
commit 9458d49
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git 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
@@ -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);