USB: fix bug in usb_unlink_anchored_urbs()

Irqs must not accidentally be reenabled.

Signed-off-by: Oliver Neukum <oneukum@suse.de>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Oliver Neukum 2008-08-18 16:36:52 +02:00 committed by Greg Kroah-Hartman
parent f8033827d8
commit 77571f05a4

View file

@ -601,15 +601,20 @@ EXPORT_SYMBOL_GPL(usb_kill_anchored_urbs);
void usb_unlink_anchored_urbs(struct usb_anchor *anchor) void usb_unlink_anchored_urbs(struct usb_anchor *anchor)
{ {
struct urb *victim; struct urb *victim;
unsigned long flags;
spin_lock_irq(&anchor->lock); spin_lock_irqsave(&anchor->lock, flags);
while (!list_empty(&anchor->urb_list)) { while (!list_empty(&anchor->urb_list)) {
victim = list_entry(anchor->urb_list.prev, struct urb, victim = list_entry(anchor->urb_list.prev, struct urb,
anchor_list); anchor_list);
usb_get_urb(victim);
spin_unlock_irqrestore(&anchor->lock, flags);
/* this will unanchor the URB */ /* this will unanchor the URB */
usb_unlink_urb(victim); usb_unlink_urb(victim);
usb_put_urb(victim);
spin_lock_irqsave(&anchor->lock, flags);
} }
spin_unlock_irq(&anchor->lock); spin_unlock_irqrestore(&anchor->lock, flags);
} }
EXPORT_SYMBOL_GPL(usb_unlink_anchored_urbs); EXPORT_SYMBOL_GPL(usb_unlink_anchored_urbs);