---

yaml --- r: 133496 b: refs/heads/master c: c49cfa9 h: refs/heads/master v: v3
git-mirror · Mar 24, 2009 · 7522ac8 · 7522ac8
1 parent 8ed7f5e
commit 7522ac8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81d043c2f30b157b96cb8ef2b570d12c112e395d
+refs/heads/master: c49cfa9170256295f4a0fd1668a2411fc05d6b33
diff --git a/trunk/drivers/usb/serial/usb-serial.c b/trunk/drivers/usb/serial/usb-serial.c
@@ -1085,12 +1085,15 @@ EXPORT_SYMBOL(usb_serial_suspend);
 int usb_serial_resume(struct usb_interface *intf)
 {
 	struct usb_serial *serial = usb_get_intfdata(intf);
+	int rv;
 
 	serial->suspending = 0;
 	if (serial->type->resume)
-		return serial->type->resume(serial);
+		rv = serial->type->resume(serial);
+	else
+		rv = usb_serial_generic_resume(serial);
 
-	return 0;
+	return rv;
 }
 EXPORT_SYMBOL(usb_serial_resume);