diff options
| author | Alan Stern | 2006-07-28 23:07:34 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2006-08-03 01:41:42 +0200 |
| commit | b4dbda1a22d236842b75be4e2679a96a4fd72632 (patch) | |
| tree | ae910b3268c443e883b81a46a3bc7e34450ce0d8 /drivers/usb | |
| parent | USB: fix the USB_GADGET_DUMMY_HCD dependencies (diff) | |
| download | kernel-qcow2-linux-b4dbda1a22d236842b75be4e2679a96a4fd72632.tar.gz kernel-qcow2-linux-b4dbda1a22d236842b75be4e2679a96a4fd72632.tar.xz kernel-qcow2-linux-b4dbda1a22d236842b75be4e2679a96a4fd72632.zip | |
USB: dummy-hcd: disable interrupts during req->complete
This patch (as756) fixes a bug in dummy-hcd found by the lockdep
checker. In one of the code paths, the driver did not disable
interrupts before calling a request completion routine.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/gadget/dummy_hcd.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c index 4be47195bd38..7d1c22c34957 100644 --- a/drivers/usb/gadget/dummy_hcd.c +++ b/drivers/usb/gadget/dummy_hcd.c @@ -609,7 +609,8 @@ static int dummy_dequeue (struct usb_ep *_ep, struct usb_request *_req) if (!dum->driver) return -ESHUTDOWN; - spin_lock_irqsave (&dum->lock, flags); + local_irq_save (flags); + spin_lock (&dum->lock); list_for_each_entry (req, &ep->queue, queue) { if (&req->req == _req) { list_del_init (&req->queue); @@ -618,7 +619,7 @@ static int dummy_dequeue (struct usb_ep *_ep, struct usb_request *_req) break; } } - spin_unlock_irqrestore (&dum->lock, flags); + spin_unlock (&dum->lock); if (retval == 0) { dev_dbg (udc_dev(dum), @@ -626,6 +627,7 @@ static int dummy_dequeue (struct usb_ep *_ep, struct usb_request *_req) req, _ep->name, _req->length, _req->buf); _req->complete (_ep, _req); } + local_irq_restore (flags); return retval; } |