Commit 5f2e5fb8 authored by David Mosberger's avatar David Mosberger Committed by Greg Kroah-Hartman

drivers: usb: core: Minimize irq disabling in usb_sg_cancel()

Restructure usb_sg_cancel() so we don't have to disable interrupts
while cancelling the URBs.
Suggested-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarDavid Mosberger <davidm@egauge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 98b74b0e
...@@ -577,18 +577,18 @@ EXPORT_SYMBOL_GPL(usb_sg_wait); ...@@ -577,18 +577,18 @@ EXPORT_SYMBOL_GPL(usb_sg_wait);
void usb_sg_cancel(struct usb_sg_request *io) void usb_sg_cancel(struct usb_sg_request *io)
{ {
unsigned long flags; unsigned long flags;
int i, retval;
spin_lock_irqsave(&io->lock, flags); spin_lock_irqsave(&io->lock, flags);
if (io->status) {
/* shut everything down, if it didn't already */ spin_unlock_irqrestore(&io->lock, flags);
if (!io->status) { return;
int i; }
/* shut everything down */
io->status = -ECONNRESET; io->status = -ECONNRESET;
spin_unlock(&io->lock); spin_unlock_irqrestore(&io->lock, flags);
for (i = 0; i < io->entries; i++) {
int retval;
for (i = io->entries - 1; i >= 0; --i) {
usb_block_urb(io->urbs[i]); usb_block_urb(io->urbs[i]);
retval = usb_unlink_urb(io->urbs[i]); retval = usb_unlink_urb(io->urbs[i]);
...@@ -599,9 +599,6 @@ void usb_sg_cancel(struct usb_sg_request *io) ...@@ -599,9 +599,6 @@ void usb_sg_cancel(struct usb_sg_request *io)
dev_warn(&io->dev->dev, "%s, unlink --> %d\n", dev_warn(&io->dev->dev, "%s, unlink --> %d\n",
__func__, retval); __func__, retval);
} }
spin_lock(&io->lock);
}
spin_unlock_irqrestore(&io->lock, flags);
} }
EXPORT_SYMBOL_GPL(usb_sg_cancel); EXPORT_SYMBOL_GPL(usb_sg_cancel);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment