Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 303968
b: refs/heads/master
c: dcd82cd
h: refs/heads/master
v: v3
  • Loading branch information
Greg Kroah-Hartman committed May 16, 2012
1 parent db07ea6 commit c0775a7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 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: 1c1eaba8e72768156db4faff3a2c3a6ca7dea129
refs/heads/master: dcd82cd1c249fb85bad3da5d2a07a116cd65a22b
6 changes: 4 additions & 2 deletions trunk/drivers/usb/serial/usb-serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -1176,8 +1176,10 @@ static int usb_serial_reset_resume(struct usb_interface *intf)
serial->suspending = 0;
if (serial->type->reset_resume)
rv = serial->type->reset_resume(serial);
else
rv = usb_serial_generic_resume(serial);
else {
rv = -EOPNOTSUPP;
intf->needs_binding = 1;
}

return rv;
}
Expand Down

0 comments on commit c0775a7

Please sign in to comment.