Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 979eef33 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'musb-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next 

usb: musb: patches for v3.6 merge window

Just two patches here:

First we have a fix to disable DMA in case DMA channel
request fails.

Second, there's a fix for situations where the user
kills musb (by rmmod or any other means) while a
transfer is on the fly. In such cases, we could be
led into a NULL pointer dereference due to endpoint
being disabled and endpoint descriptor being NULL.
parents e765bf84 2ed9127c

drivers/usb/musb/musb_gadget.c

+14 −0
Original line number Diff line number Diff line
@@ -328,6 +328,13 @@ static void txstate(struct musb *musb, struct musb_request *req) 


	musb_ep = req->ep;



	/* Check if EP is disabled */

	if (!musb_ep->desc) {

		dev_dbg(musb->controller, "ep:%s disabled - ignore request\n",

						musb_ep->end_point.name);

		return;

	}



	/* we shouldn't get here while DMA is active ... but we do ... */

	if (dma_channel_status(musb_ep->dma) == MUSB_DMA_STATUS_BUSY) {

		dev_dbg(musb->controller, "dma pending...\n");
@@ -650,6 +657,13 @@ static void rxstate(struct musb *musb, struct musb_request *req) 


	len = musb_ep->packet_sz;



	/* Check if EP is disabled */

	if (!musb_ep->desc) {

		dev_dbg(musb->controller, "ep:%s disabled - ignore request\n",

						musb_ep->end_point.name);

		return;

	}



	/* We shouldn't get here while DMA is active, but we do... */

	if (dma_channel_status(musb_ep->dma) == MUSB_DMA_STATUS_BUSY) {

		dev_dbg(musb->controller, "DMA pending...\n");

drivers/usb/musb/musb_host.c

+5 −1
Original line number Diff line number Diff line
@@ -1746,7 +1746,11 @@ void musb_host_rx(struct musb *musb, u8 epnum) 
				c->channel_release(dma);

				hw_ep->rx_channel = NULL;

				dma = NULL;

				/* REVISIT reset CSR */

				val = musb_readw(epio, MUSB_RXCSR);

				val &= ~(MUSB_RXCSR_DMAENAB

					| MUSB_RXCSR_H_AUTOREQ

					| MUSB_RXCSR_AUTOCLEAR);

				musb_writew(epio, MUSB_RXCSR, val);

			}

		}

#endif	/* Mentor DMA */