Skip to content

Commit c49cfa9

Browse files
Oliver Neukumgregkh
authored andcommitted
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 <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 81d043c commit c49cfa9

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

drivers/usb/serial/usb-serial.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1085,12 +1085,15 @@ EXPORT_SYMBOL(usb_serial_suspend);
10851085
int usb_serial_resume(struct usb_interface *intf)
10861086
{
10871087
struct usb_serial *serial = usb_get_intfdata(intf);
1088+
int rv;
10881089

10891090
serial->suspending = 0;
10901091
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);
10921095

1093-
return 0;
1096+
return rv;
10941097
}
10951098
EXPORT_SYMBOL(usb_serial_resume);
10961099

0 commit comments

Comments
 (0)