aboutsummaryrefslogtreecommitdiff
path: root/drivers/usb/serial
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/serial')
-rw-r--r--drivers/usb/serial/usb-serial.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index c6aaa6dc756..18f94084731 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/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);