iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: usblp: use irqsave() in USB's complete callback

Browse Source 
The USB completion callback does not disable interrupts while acquiring
the lock. We want to remove the local_irq_disable() invocation from
__usb_hcd_giveback_urb() and therefore it is required for the callback
handler to disable the interrupts while acquiring the lock.
The callback may be invoked either in IRQ or BH context depending on the
USB host controller.
Use the _irqsave() variant of the locking primitives.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sebastian Andrzej Siewior 2018-06-25 00:08:38 +02:00 committed by Greg Kroah-Hartman
parent 3f38dace1a
commit 0f5f7ace85
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/usb/class/usblp.c
View File

@ -292,6 +292,7 @@ static void usblp_bulk_read(struct urb *urb)
{ {
struct usblp *usblp = urb->context; struct usblp *usblp = urb->context;
int status = urb->status; int status = urb->status;
unsigned long flags;
if (usblp->present && usblp->used) { if (usblp->present && usblp->used) {
if (status) if (status)
@ -299,14 +300,14 @@ static void usblp_bulk_read(struct urb *urb)
"nonzero read bulk status received: %d\n", "nonzero read bulk status received: %d\n",
usblp->minor, status); usblp->minor, status);
} }
spin_lock(&usblp->lock); spin_lock_irqsave(&usblp->lock, flags);
if (status < 0) if (status < 0)
usblp->rstatus = status; usblp->rstatus = status;
else else
usblp->rstatus = urb->actual_length; usblp->rstatus = urb->actual_length;
usblp->rcomplete = 1; usblp->rcomplete = 1;
wake_up(&usblp->rwait); wake_up(&usblp->rwait);
spin_unlock(&usblp->lock); spin_unlock_irqrestore(&usblp->lock, flags);
usb_free_urb(urb); usb_free_urb(urb);
} }
@ -315,6 +316,7 @@ static void usblp_bulk_write(struct urb *urb)
{ {
struct usblp *usblp = urb->context; struct usblp *usblp = urb->context;
int status = urb->status; int status = urb->status;
unsigned long flags;
if (usblp->present && usblp->used) { if (usblp->present && usblp->used) {
if (status) if (status)
@ -322,7 +324,7 @@ static void usblp_bulk_write(struct urb *urb)
"nonzero write bulk status received: %d\n", "nonzero write bulk status received: %d\n",
usblp->minor, status); usblp->minor, status);
} }
spin_lock(&usblp->lock); spin_lock_irqsave(&usblp->lock, flags);
if (status < 0) if (status < 0)
usblp->wstatus = status; usblp->wstatus = status;
else else
@ -330,7 +332,7 @@ static void usblp_bulk_write(struct urb *urb)
usblp->no_paper = 0; usblp->no_paper = 0;
usblp->wcomplete = 1; usblp->wcomplete = 1;
wake_up(&usblp->wwait); wake_up(&usblp->wwait);
spin_unlock(&usblp->lock); spin_unlock_irqrestore(&usblp->lock, flags);
usb_free_urb(urb); usb_free_urb(urb);
} }