diff options
| author |   Greg Kroah-Hartman <gregkh@google.com> | 2016-06-23 14:20:02 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2016-06-23 14:20:02 -0700 |
| commit | 19cdabcf0ba92ddd87bdb86f8e3ceaae2dd6f8bb (patch) | |
| tree | e408991db47d3af8823442433780188b05771591 /drivers/staging/greybus/es2.c | |
| parent | greybus: timesync: Enforce TimeSync locks as subordinate to Interface locks (diff) | |
| download | linux-dev-19cdabcf0ba92ddd87bdb86f8e3ceaae2dd6f8bb.tar.xz linux-dev-19cdabcf0ba92ddd87bdb86f8e3ceaae2dd6f8bb.zip | |
greybus: Revert "greybus: don't use spin_lock_irq()"
This reverts commit 469fbe5da0229edcb42aa08bef8e10feaa37e6d7.
It isn't correct in places.
Reported-by: Gjorgji Rosikopulos <rosikopulos_gjorgji@projectara.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'drivers/staging/greybus/es2.c')
| -rw-r--r-- | drivers/staging/greybus/es2.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/staging/greybus/es2.c b/drivers/staging/greybus/es2.c index 89fe7641cd24..bdf502493e31 100644 --- a/drivers/staging/greybus/es2.c +++ b/drivers/staging/greybus/es2.c @@ -496,12 +496,11 @@ static void message_cancel(struct gb_message *message) struct gb_host_device *hd = message->operation->connection->hd; struct es2_ap_dev *es2 = hd_to_es2(hd); struct urb *urb; - unsigned long flags; int i; might_sleep(); - spin_lock_irqsave(&es2->cport_out_urb_lock, flags); + spin_lock_irq(&es2->cport_out_urb_lock); urb = message->hcpriv; /* Prevent dynamically allocated urb from being deallocated. */ @@ -514,14 +513,14 @@ static void message_cancel(struct gb_message *message) break; } } - spin_unlock_irqrestore(&es2->cport_out_urb_lock, flags); + spin_unlock_irq(&es2->cport_out_urb_lock); usb_kill_urb(urb); if (i < NUM_CPORT_OUT_URB) { - spin_lock_irqsave(&es2->cport_out_urb_lock, flags); + spin_lock_irq(&es2->cport_out_urb_lock); es2->cport_out_urb_cancelled[i] = false; - spin_unlock_irqrestore(&es2->cport_out_urb_lock, flags); + spin_unlock_irq(&es2->cport_out_urb_lock); } usb_free_urb(urb); |