diff options
| author | David Mosberger <davidm@egauge.net> | 2016-03-08 14:42:49 -0700 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2020-06-11 19:05:40 +0100 |
| commit | 07d5d558e8711be09caa3783a8514514b3308e0f (patch) | |
| tree | 9564d868b3f8790330f635a5d351b1a84d1df6f0 | |
| parent | 371262ec7bbf0ffc4b2a66c3f7c9230ee5e6a2c5 (diff) | |
| download | linux-stable-07d5d558e8711be09caa3783a8514514b3308e0f.tar.gz linux-stable-07d5d558e8711be09caa3783a8514514b3308e0f.tar.bz2 linux-stable-07d5d558e8711be09caa3783a8514514b3308e0f.zip | |
drivers: usb: core: Minimize irq disabling in usb_sg_cancel()
commit 5f2e5fb873e269fcb806165715d237f0de4ecf1d upstream.
Restructure usb_sg_cancel() so we don't have to disable interrupts
while cancelling the URBs.
Suggested-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: David Mosberger <davidm@egauge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | drivers/usb/core/message.c | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c index a3abe56898a9..fab052f2bb97 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c @@ -581,31 +581,28 @@ EXPORT_SYMBOL_GPL(usb_sg_wait); void usb_sg_cancel(struct usb_sg_request *io) { unsigned long flags; + int i, retval; spin_lock_irqsave(&io->lock, flags); + if (io->status) { + spin_unlock_irqrestore(&io->lock, flags); + return; + } + /* shut everything down */ + io->status = -ECONNRESET; + spin_unlock_irqrestore(&io->lock, flags); - /* shut everything down, if it didn't already */ - if (!io->status) { - int i; + for (i = io->entries - 1; i >= 0; --i) { + usb_block_urb(io->urbs[i]); - io->status = -ECONNRESET; - spin_unlock(&io->lock); - for (i = 0; i < io->entries; i++) { - int retval; - - usb_block_urb(io->urbs[i]); - - retval = usb_unlink_urb(io->urbs[i]); - if (retval != -EINPROGRESS - && retval != -ENODEV - && retval != -EBUSY - && retval != -EIDRM) - dev_warn(&io->dev->dev, "%s, unlink --> %d\n", - __func__, retval); - } - spin_lock(&io->lock); + retval = usb_unlink_urb(io->urbs[i]); + if (retval != -EINPROGRESS + && retval != -ENODEV + && retval != -EBUSY + && retval != -EIDRM) + dev_warn(&io->dev->dev, "%s, unlink --> %d\n", + __func__, retval); } - spin_unlock_irqrestore(&io->lock, flags); } EXPORT_SYMBOL_GPL(usb_sg_cancel); |