git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[pandora-kernel.git]
/
drivers
/
usb
/
core
/
driver.c
diff --git
a/drivers/usb/core/driver.c
b/drivers/usb/core/driver.c
index
b9278a1
..
fca6172
100644
(file)
--- 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);
* Just re-enable it without affecting the endpoint toggles.
*/
usb_enable_interface(udev, intf, false);
- } else if (!error &&
intf->dev.power.status == DPM_ON
) {
+ } else if (!error &&
!intf->dev.power.in_suspend
) {
r = usb_set_interface(udev, intf->altsetting[0].
desc.bInterfaceNumber, 0);
if (r < 0)
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 */
}
/* Try to rebind the interface */
- if (
intf->dev.power.status == DPM_ON
) {
+ if (
!intf->dev.power.in_suspend
) {
intf->needs_binding = 0;
rc = device_attach(&intf->dev);
if (rc < 0)
intf->needs_binding = 0;
rc = device_attach(&intf->dev);
if (rc < 0)
@@
-1107,8
+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->condition == USB_INTERFACE_UNBOUND) {
/* Carry out a deferred switch to altsetting 0 */
- if (intf->needs_altsetting0 &&
- intf->dev.power.status == DPM_ON) {
+ if (intf->needs_altsetting0 && !intf->dev.power.in_suspend) {
usb_set_interface(udev, intf->altsetting[0].
desc.bInterfaceNumber, 0);
intf->needs_altsetting0 = 0;
usb_set_interface(udev, intf->altsetting[0].
desc.bInterfaceNumber, 0);
intf->needs_altsetting0 = 0;