OMAP:MUSB: Corrects urb unlink function path (2492e674) · Commits · 戴 / test

Fixes kernel panic while ISO IN transfer is aborted.Replaced usb_hcd_unlink_urb_from_ep() from musb_giveback() to __musb_giveback() to make sure urb is unlinked before giveback when __musb_giveback() is called from musb_urb_dequeue(). Acquired musb->lock() before usb_hcd_unlink_urb_from_ep() within in enqueue path. Signed-off-by:

Ajay Kumar Gupta <ajay.gupta@ti.com> Signed-off-by:

Felipe Balbi <felipe.balbi@nokia.com> Signed-off-by:

Greg Kroah-Hartman <gregkh@suse.de>

drivers/usb/musb/musb_host.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -291,6 +291,7 @@ __acquires(musb->lock)
		urb->actual_length, urb->transfer_buffer_length
		);

		usb_hcd_unlink_urb_from_ep(musb_to_hcd(musb), urb);
		spin_unlock(&musb->lock);
		usb_hcd_giveback_urb(musb_to_hcd(musb), urb, status);
		spin_lock(&musb->lock);
		@@ -353,8 +354,6 @@ musb_giveback(struct musb_qh qh, struct urb urb, int status)
		break;
		}

		usb_hcd_unlink_urb_from_ep(musb_to_hcd(musb), urb);

		qh->is_ready = 0;
		__musb_giveback(musb, urb, status);
		qh->is_ready = ready;
		@@ -1791,7 +1790,9 @@ static int musb_urb_enqueue(
		*/
		qh = kzalloc(sizeof *qh, mem_flags);
		if (!qh) {
		spin_lock_irqsave(&musb->lock, flags);
		usb_hcd_unlink_urb_from_ep(hcd, urb);
		spin_unlock_irqrestore(&musb->lock, flags);
		return -ENOMEM;
		}

		@@ -1907,7 +1908,9 @@ static int musb_urb_enqueue(

		done:
		if (ret != 0) {
		spin_lock_irqsave(&musb->lock, flags);
		usb_hcd_unlink_urb_from_ep(hcd, urb);
		spin_unlock_irqrestore(&musb->lock, flags);
		kfree(qh);
		}
		return ret;

Admin message