diff options
Diffstat (limited to 'drivers/staging/usbip/vhci_hcd.c')
-rw-r--r-- | drivers/staging/usbip/vhci_hcd.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c index a76e8fa69b6..5b94b8037c5 100644 --- a/drivers/staging/usbip/vhci_hcd.c +++ b/drivers/staging/usbip/vhci_hcd.c | |||
@@ -344,9 +344,9 @@ static int vhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, | |||
344 | * */ | 344 | * */ |
345 | if (dum->resuming && time_after(jiffies, dum->re_timeout)) { | 345 | if (dum->resuming && time_after(jiffies, dum->re_timeout)) { |
346 | dum->port_status[rhport] |= | 346 | dum->port_status[rhport] |= |
347 | (1 << USB_PORT_FEAT_C_SUSPEND); | 347 | (1 << USB_PORT_FEAT_C_SUSPEND); |
348 | dum->port_status[rhport] &= | 348 | dum->port_status[rhport] &= |
349 | ~(1 << USB_PORT_FEAT_SUSPEND); | 349 | ~(1 << USB_PORT_FEAT_SUSPEND); |
350 | dum->resuming = 0; | 350 | dum->resuming = 0; |
351 | dum->re_timeout = 0; | 351 | dum->re_timeout = 0; |
352 | /* if (dum->driver && dum->driver->resume) { | 352 | /* if (dum->driver && dum->driver->resume) { |
@@ -639,9 +639,7 @@ no_need_xmit: | |||
639 | usb_hcd_unlink_urb_from_ep(hcd, urb); | 639 | usb_hcd_unlink_urb_from_ep(hcd, urb); |
640 | no_need_unlink: | 640 | no_need_unlink: |
641 | spin_unlock_irqrestore(&the_controller->lock, flags); | 641 | spin_unlock_irqrestore(&the_controller->lock, flags); |
642 | |||
643 | usb_hcd_giveback_urb(vhci_to_hcd(the_controller), urb, urb->status); | 642 | usb_hcd_giveback_urb(vhci_to_hcd(the_controller), urb, urb->status); |
644 | |||
645 | return ret; | 643 | return ret; |
646 | } | 644 | } |
647 | 645 | ||
@@ -1033,9 +1031,8 @@ static int vhci_bus_resume(struct usb_hcd *hcd) | |||
1033 | hcd->state = HC_STATE_RUNNING; | 1031 | hcd->state = HC_STATE_RUNNING; |
1034 | } | 1032 | } |
1035 | spin_unlock_irq(&vhci->lock); | 1033 | spin_unlock_irq(&vhci->lock); |
1036 | return rc; | ||
1037 | 1034 | ||
1038 | return 0; | 1035 | return rc; |
1039 | } | 1036 | } |
1040 | 1037 | ||
1041 | #else | 1038 | #else |