Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 264937
b: refs/heads/master
c: c5a4859
h: refs/heads/master
i:
  264935: 77f0046
v: v3
  • Loading branch information
Jim Wylder authored and Greg Kroah-Hartman committed Sep 9, 2011
1 parent 9c3aa83 commit 9aa8e1b
Show file tree
Hide file tree
Showing 2 changed files with 2 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: e16da02fcdf1c5e824432f88abf42623dafdf191
refs/heads/master: c5a48592d874ddef8c7880311581eccf0eb30c3b
2 changes: 1 addition & 1 deletion trunk/drivers/usb/core/driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -1583,7 +1583,7 @@ int usb_autopm_get_interface_async(struct usb_interface *intf)
dev_vdbg(&intf->dev, "%s: cnt %d -> %d\n",
__func__, atomic_read(&intf->dev.power.usage_count),
status);
if (status > 0)
if (status > 0 || status == -EINPROGRESS)
status = 0;
return status;
}
Expand Down

0 comments on commit 9aa8e1b

Please sign in to comment.