diff options
author | David Brownell <dbrownell@users.sourceforge.net> | 2008-07-26 11:06:24 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-08-13 20:32:47 -0400 |
commit | c728df70ab0dd59b8ccdc3c611ea88925e6697db (patch) | |
tree | b9b56a813b061d14ac38cfb94e998d7437c5eb45 | |
parent | 88d987d6db2a14b191f4eb21cc623dae31e28e9d (diff) |
USB: fix USB boot crash, ecm_do_notify(), list_add corruption. prev->next should be next (ffff88003b8f82f8)
This fixes a BUG() turned up by Ingo via randconfig testing, where
CONFIG_LIST_DEBUG turned up list corruption. The corruption was
caused by the dummy_hcd (single-machine test harness for gadget and
HCD code) trashing the request queue when driven by the new CDC
composite gadget an I/O pattern that was previously uncommon.
Fix suggested by Alan Stern.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Tested-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/usb/gadget/dummy_hcd.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c index 21d1406af9ee..7600a0c78753 100644 --- a/drivers/usb/gadget/dummy_hcd.c +++ b/drivers/usb/gadget/dummy_hcd.c | |||
@@ -542,13 +542,14 @@ dummy_queue (struct usb_ep *_ep, struct usb_request *_req, | |||
542 | req->req.context = dum; | 542 | req->req.context = dum; |
543 | req->req.complete = fifo_complete; | 543 | req->req.complete = fifo_complete; |
544 | 544 | ||
545 | list_add_tail(&req->queue, &ep->queue); | ||
545 | spin_unlock (&dum->lock); | 546 | spin_unlock (&dum->lock); |
546 | _req->actual = _req->length; | 547 | _req->actual = _req->length; |
547 | _req->status = 0; | 548 | _req->status = 0; |
548 | _req->complete (_ep, _req); | 549 | _req->complete (_ep, _req); |
549 | spin_lock (&dum->lock); | 550 | spin_lock (&dum->lock); |
550 | } | 551 | } else |
551 | list_add_tail (&req->queue, &ep->queue); | 552 | list_add_tail(&req->queue, &ep->queue); |
552 | spin_unlock_irqrestore (&dum->lock, flags); | 553 | spin_unlock_irqrestore (&dum->lock, flags); |
553 | 554 | ||
554 | /* real hardware would likely enable transfers here, in case | 555 | /* real hardware would likely enable transfers here, in case |