summaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/isp1760-hcd.c
diff options
context:
space:
mode:
authorArvid Brodin <arvid.brodin@enea.com>2011-03-07 15:36:21 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-03-07 12:14:07 -0800
commitd3cf2a8d4ddd121dbf4ad48c995648af04e0cfbf (patch)
tree2398d52e4bfaa3035e114a39618a1d3cd841daac /drivers/usb/host/isp1760-hcd.c
parent9b37596a2e860404503a3f2a6513db60c296bfdc (diff)
downloadop-kernel-dev-d3cf2a8d4ddd121dbf4ad48c995648af04e0cfbf.zip
op-kernel-dev-d3cf2a8d4ddd121dbf4ad48c995648af04e0cfbf.tar.gz
usb/isp1760: Fix crash when unplugging bug
This fixes a problem with my previous patch series where there's a great risk that the kernel will crash when unplugging interrupt devices from the USB port. These lines must have got missing when I rebased the patches from the older kernel I was working with to 2.6.37 and 2.6-next: This fixes a bug where the kernel may crash if you unplug a USB device that has active interrupt transfers. Signed-off-by: Arvid Brodin <arvid.brodin@enea.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host/isp1760-hcd.c')
-rw-r--r--drivers/usb/host/isp1760-hcd.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/usb/host/isp1760-hcd.c b/drivers/usb/host/isp1760-hcd.c
index d2b674a..c7c1e0a 100644
--- a/drivers/usb/host/isp1760-hcd.c
+++ b/drivers/usb/host/isp1760-hcd.c
@@ -1624,14 +1624,14 @@ static int isp1760_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
ptd_write(hcd->regs, reg_base, i, &ptd);
- qtd = ints->qtd;
+ qtd = ints[i].qtd;
qh = ints[i].qh;
free_mem(hcd, qtd);
qtd = clean_up_qtdlist(qtd, qh);
- ints->qh = NULL;
- ints->qtd = NULL;
+ ints[i].qh = NULL;
+ ints[i].qtd = NULL;
isp1760_urb_done(hcd, urb);
if (qtd)
@@ -1655,7 +1655,6 @@ static int isp1760_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
if (!qtd)
break;
}
- ints++;
}
spin_unlock_irqrestore(&priv->lock, flags);
OpenPOWER on IntegriCloud