diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-04 14:22:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-04 14:22:53 -0700 |
| commit | 0ecb063a2976b62d5eaecbd5a70bb994fe4b5a8a (patch) | |
| tree | 2b599cd66f1747d4e246d906b0e240ffd7ed0263 /drivers/usb/host/isp1760-hcd.c | |
| parent | bd355f8ae6577aa6b444ab76bb1dfeb1a7002d9f (diff) | |
| parent | 4f0871a6c7811a433513c3788a7cce27033bb8b8 (diff) | |
| download | lwn-0ecb063a2976b62d5eaecbd5a70bb994fe4b5a8a.tar.gz lwn-0ecb063a2976b62d5eaecbd5a70bb994fe4b5a8a.zip | |
Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
xHCI: Clear PLC in xhci_bus_resume()
USB: fix regression in usbip by setting has_tt flag
usb/isp1760: Report correct urb status after unlink
omap:usb: add regulator support for EHCI
mfd: Fix usbhs_enable error handling
usb: musb: gadget: Fix out-of-sync runtime pm calls
usb: musb: omap2430: Fix retention idle on musb peripheral only boards
Diffstat (limited to 'drivers/usb/host/isp1760-hcd.c')
| -rw-r--r-- | drivers/usb/host/isp1760-hcd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/host/isp1760-hcd.c b/drivers/usb/host/isp1760-hcd.c index 795345ad45e6..7b2e69aa2e98 100644 --- a/drivers/usb/host/isp1760-hcd.c +++ b/drivers/usb/host/isp1760-hcd.c @@ -1633,6 +1633,7 @@ static int isp1760_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status) ints[i].qh = NULL; ints[i].qtd = NULL; + urb->status = status; isp1760_urb_done(hcd, urb); if (qtd) pe(hcd, qh, qtd); |