Skip to content

Commit

Permalink
usb: adutux: use irqsave() in USB's complete callback
Browse files Browse the repository at this point in the history
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Sebastian Andrzej Siewior authored and Greg Kroah-Hartman committed Jun 28, 2018
1 parent 7375fc9 commit 957ada7
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions drivers/usb/misc/adutux.c
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,12 @@ static void adu_interrupt_in_callback(struct urb *urb)
{
struct adu_device *dev = urb->context;
int status = urb->status;
unsigned long flags;

adu_debug_data(&dev->udev->dev, __func__,
urb->actual_length, urb->transfer_buffer);

spin_lock(&dev->buflock);
spin_lock_irqsave(&dev->buflock, flags);

if (status != 0) {
if ((status != -ENOENT) && (status != -ECONNRESET) &&
Expand Down Expand Up @@ -190,7 +191,7 @@ static void adu_interrupt_in_callback(struct urb *urb)

exit:
dev->read_urb_finished = 1;
spin_unlock(&dev->buflock);
spin_unlock_irqrestore(&dev->buflock, flags);
/* always wake up so we recover from errors */
wake_up_interruptible(&dev->read_wait);
}
Expand All @@ -199,6 +200,7 @@ static void adu_interrupt_out_callback(struct urb *urb)
{
struct adu_device *dev = urb->context;
int status = urb->status;
unsigned long flags;

adu_debug_data(&dev->udev->dev, __func__,
urb->actual_length, urb->transfer_buffer);
Expand All @@ -213,10 +215,10 @@ static void adu_interrupt_out_callback(struct urb *urb)
return;
}

spin_lock(&dev->buflock);
spin_lock_irqsave(&dev->buflock, flags);
dev->out_urb_finished = 1;
wake_up(&dev->write_wait);
spin_unlock(&dev->buflock);
spin_unlock_irqrestore(&dev->buflock, flags);
}

static int adu_open(struct inode *inode, struct file *file)
Expand Down

0 comments on commit 957ada7

Please sign in to comment.