aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorOliver Neukum <oliver@neukum.org>2009-02-06 12:06:43 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2009-03-24 19:20:30 -0400
commitc49cfa9170256295f4a0fd1668a2411fc05d6b33 (patch)
tree423338985857ecf25a22ac8aa25fe747d4c1d63c /drivers/usb
parent81d043c2f30b157b96cb8ef2b570d12c112e395d (diff)
USB: serial: use generic method if no alternative is provided in usb serial layer
This patch makes use of the generic method if a serial driver provides no implementation. This simplifies implementing suspend/resume support in serial drivers. Signed-off-by: Oliver Neukum <oneukum@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-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 c6aaa6dc7564..18f940847316 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -1085,12 +1085,15 @@ EXPORT_SYMBOL(usb_serial_suspend);
1085int usb_serial_resume(struct usb_interface *intf) 1085int usb_serial_resume(struct usb_interface *intf)
1086{ 1086{
1087 struct usb_serial *serial = usb_get_intfdata(intf); 1087 struct usb_serial *serial = usb_get_intfdata(intf);
1088 int rv;
1088 1089
1089 serial->suspending = 0; 1090 serial->suspending = 0;
1090 if (serial->type->resume) 1091 if (serial->type->resume)
1091 return serial->type->resume(serial); 1092 rv = serial->type->resume(serial);
1093 else
1094 rv = usb_serial_generic_resume(serial);
1092 1095
1093 return 0; 1096 return rv;
1094} 1097}
1095EXPORT_SYMBOL(usb_serial_resume); 1098EXPORT_SYMBOL(usb_serial_resume);
1096 1099