diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-10 15:07:24 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-10 15:07:32 +1000 |
commit | 2b5e8511554f577dd5045a586aa513a3ecf1c4b6 (patch) | |
tree | 3e278d74d1840a4e7cb5e1dd9664639b43d3f4a7 /drivers/usb/host/ehci-q.c | |
parent | 845c4844a5b3ea6883b2bd9ffe256f95ee6f2b1e (diff) | |
parent | 49fb5166b4a66d7a2dc22b4c36f5661123a39d71 (diff) |
Merge branch 'quilt/usb'
Conflicts:
drivers/input/tablet/acecad.c
drivers/input/tablet/kbtab.c
drivers/input/tablet/wacom_sys.c
sound/usb/usbaudio.c
Diffstat (limited to 'drivers/usb/host/ehci-q.c')
-rw-r--r-- | drivers/usb/host/ehci-q.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c index 89521775c567..11a79c4f4a9d 100644 --- a/drivers/usb/host/ehci-q.c +++ b/drivers/usb/host/ehci-q.c @@ -663,7 +663,7 @@ qh_urb_transaction ( */ i = urb->num_sgs; if (len > 0 && i > 0) { - sg = urb->sg->sg; + sg = urb->sg; buf = sg_dma_address(sg); /* urb->transfer_buffer_length may be smaller than the |