From 9aa8e1bf0ad201e394abc7ad53b482dc5c66e347 Mon Sep 17 00:00:00 2001 From: Jim Wylder Date: Tue, 6 Sep 2011 21:07:20 -0500 Subject: [PATCH] --- yaml --- r: 264937 b: refs/heads/master c: c5a48592d874ddef8c7880311581eccf0eb30c3b h: refs/heads/master i: 264935: 77f004626b191be75644220b1d70616156d208f0 v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/driver.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d5874dc6b643..19c65f33a1c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e16da02fcdf1c5e824432f88abf42623dafdf191 +refs/heads/master: c5a48592d874ddef8c7880311581eccf0eb30c3b diff --git a/trunk/drivers/usb/core/driver.c b/trunk/drivers/usb/core/driver.c index 34e3da5aa72a..14b83f2a4e87 100644 --- a/trunk/drivers/usb/core/driver.c +++ b/trunk/drivers/usb/core/driver.c @@ -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; }