Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 72583
b: refs/heads/master
c: 8abaee2
h: refs/heads/master
i:
  72581: 7fa5f51
  72579: b71fcb7
  72575: 2fc1927
v: v3
  • Loading branch information
Sarah Sharp authored and Greg Kroah-Hartman committed Oct 25, 2007
1 parent e1993aa commit d9bfe7f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: da6fb5704feeadd10b99a1025166f1a3f627825d
refs/heads/master: 8abaee238ebb1ef9b8bcafac7a1833f92e7f2319
4 changes: 3 additions & 1 deletion trunk/drivers/usb/serial/usb-serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -1123,7 +1123,9 @@ int usb_serial_resume(struct usb_interface *intf)
{
struct usb_serial *serial = usb_get_intfdata(intf);

return serial->type->resume(serial);
if (serial->type->resume)
return serial->type->resume(serial);
return 0;
}
EXPORT_SYMBOL(usb_serial_resume);

Expand Down

0 comments on commit d9bfe7f

Please sign in to comment.