summaryrefslogtreecommitdiffstats
path: root/drivers/usb/core
diff options
context:
space:
mode:
authorMathias Nyman <mathias.nyman@linux.intel.com>2017-12-04 14:05:45 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-12-07 16:03:15 +0100
commitc0f3ed87fde812ee4511b650516f23e4bdf1642b (patch)
tree07044be4a3de2923bfbd642527a3e9010cd6402b /drivers/usb/core
parent77be4c878c72e411ad22af96b6f81dd45c26450a (diff)
downloadblackbird-op-linux-c0f3ed87fde812ee4511b650516f23e4bdf1642b.tar.gz
blackbird-op-linux-c0f3ed87fde812ee4511b650516f23e4bdf1642b.zip
usb: Don't print a warning if interface driver rebind is deferred at resume
Interface drivers like btusb that don't support reset-resume will be rebound at resume if port was reset. Rebind is done during the pm_ops .complete callback when probe returns EPROBE_DEFER as default. Remove the "rebind failed: -517" message. Device probe will eventually take place later. [one-liner by Jerry Snitselaar posted in a mailing list question -Mathias] Suggested-by: Jerry Snitselaar <jsnitsel@redhat.com> Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/core')
-rw-r--r--drivers/usb/core/driver.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index d8d7377b5fb8..9792cedfc351 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -1070,7 +1070,7 @@ static void usb_rebind_intf(struct usb_interface *intf)
if (!intf->dev.power.is_prepared) {
intf->needs_binding = 0;
rc = device_attach(&intf->dev);
- if (rc < 0)
+ if (rc < 0 && rc != -EPROBE_DEFER)
dev_warn(&intf->dev, "rebind failed: %d\n", rc);
}
}
OpenPOWER on IntegriCloud