diff options
| author | Colin Cross <ccross@android.com> | 2011-06-29 14:29:27 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-06-29 14:29:27 -0700 |
| commit | 9b0cd4ab4e84e5738c35bd93479ac8848ec58bad (patch) | |
| tree | 1e217d95e20a05f995eaaf751b1d1064f8c7eee6 /drivers/usb | |
| parent | 7423276e38ec62563970456ec280cf5f922141dc (diff) | |
| parent | b0af8dfdd67699e25083478c63eedef2e72ebd85 (diff) | |
| download | kernel_samsung_tuna-9b0cd4ab4e84e5738c35bd93479ac8848ec58bad.zip kernel_samsung_tuna-9b0cd4ab4e84e5738c35bd93479ac8848ec58bad.tar.gz kernel_samsung_tuna-9b0cd4ab4e84e5738c35bd93479ac8848ec58bad.tar.bz2 | |
Merge commit 'v3.0-rc5' into linux-omap-3.0
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/core/driver.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c index e35a176..aa3cc46 100644 --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c @@ -375,7 +375,7 @@ static int usb_unbind_interface(struct device *dev) * Just re-enable it without affecting the endpoint toggles. */ usb_enable_interface(udev, intf, false); - } else if (!error && !intf->dev.power.in_suspend) { + } else if (!error && !intf->dev.power.is_prepared) { r = usb_set_interface(udev, intf->altsetting[0]. desc.bInterfaceNumber, 0); if (r < 0) @@ -960,7 +960,7 @@ void usb_rebind_intf(struct usb_interface *intf) } /* Try to rebind the interface */ - if (!intf->dev.power.in_suspend) { + if (!intf->dev.power.is_prepared) { intf->needs_binding = 0; rc = device_attach(&intf->dev); if (rc < 0) @@ -1107,7 +1107,7 @@ static int usb_resume_interface(struct usb_device *udev, if (intf->condition == USB_INTERFACE_UNBOUND) { /* Carry out a deferred switch to altsetting 0 */ - if (intf->needs_altsetting0 && !intf->dev.power.in_suspend) { + if (intf->needs_altsetting0 && !intf->dev.power.is_prepared) { usb_set_interface(udev, intf->altsetting[0]. desc.bInterfaceNumber, 0); intf->needs_altsetting0 = 0; |