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

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

Merge tag 'fixes-for-v3.7-rc3' of... 

Merge tag 'fixes-for-v3.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus

usb: fixes for v3.7-rc3

Here's a new set of fixes for v3.7-rc3. It's quite small, only
four patches.

There's one bug fix for the newly added musb-dsps glue layer where
we could be overflowing a buffer when creating the instance name.

NET2272 got a fix for a case where the lock would be left held
when exiting the IRQ handler with error in case of Spurious IRQs.

Renensas USBHS got a DMA stall fix which would cause transfers to
stall forever and a NULL pointer deref fix in case of pipe detach.
parents 3b6054da 1cb60156

drivers/usb/gadget/net2272.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -2069,8 +2069,10 @@ static irqreturn_t net2272_irq(int irq, void *_dev) 
#if defined(PLX_PCI_RDK2)

#if defined(PLX_PCI_RDK2)

	/* see if PCI int for us by checking irqstat */

	/* see if PCI int for us by checking irqstat */

	intcsr = readl(dev->rdk2.fpga_base_addr + RDK2_IRQSTAT);

	intcsr = readl(dev->rdk2.fpga_base_addr + RDK2_IRQSTAT);

	if (!intcsr & (1 << NET2272_PCI_IRQ))

	if (!intcsr & (1 << NET2272_PCI_IRQ)) {

		spin_unlock(&dev->lock);

		return IRQ_NONE;

		return IRQ_NONE;

	}

	/* check dma interrupts */

	/* check dma interrupts */

#endif

#endif

	/* Platform/devcice interrupt handler */

	/* Platform/devcice interrupt handler */

drivers/usb/musb/musb_dsps.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -458,11 +458,11 @@ static int __devinit dsps_create_musb_pdev(struct dsps_glue *glue, u8 id) 
	struct platform_device	*musb;

	struct platform_device	*musb;

	struct resource *res;

	struct resource *res;

	struct resource	resources[2];

	struct resource	resources[2];

	char res_name[10];

	char res_name[11];

	int ret, musbid;

	int ret, musbid;





	/* get memory resource */

	/* get memory resource */

	sprintf(res_name, "musb%d", id);

	snprintf(res_name, sizeof(res_name), "musb%d", id);

	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, res_name);

	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, res_name);

	if (!res) {

	if (!res) {

		dev_err(dev, "%s get mem resource failed\n", res_name);

		dev_err(dev, "%s get mem resource failed\n", res_name);
@@ -473,7 +473,7 @@ static int __devinit dsps_create_musb_pdev(struct dsps_glue *glue, u8 id) 
	resources[0] = *res;

	resources[0] = *res;





	/* get irq resource */

	/* get irq resource */

	sprintf(res_name, "musb%d-irq", id);

	snprintf(res_name, sizeof(res_name), "musb%d-irq", id);

	res = platform_get_resource_byname(pdev, IORESOURCE_IRQ, res_name);

	res = platform_get_resource_byname(pdev, IORESOURCE_IRQ, res_name);

	if (!res) {

	if (!res) {

		dev_err(dev, "%s get irq resource failed\n", res_name);

		dev_err(dev, "%s get irq resource failed\n", res_name);
@@ -530,7 +530,7 @@ static int __devinit dsps_create_musb_pdev(struct dsps_glue *glue, u8 id) 




		of_property_read_u32(np, "num-eps", (u32 *)&config->num_eps);

		of_property_read_u32(np, "num-eps", (u32 *)&config->num_eps);

		of_property_read_u32(np, "ram-bits", (u32 *)&config->ram_bits);

		of_property_read_u32(np, "ram-bits", (u32 *)&config->ram_bits);

		sprintf(res_name, "port%d-mode", id);

		snprintf(res_name, sizeof(res_name), "port%d-mode", id);

		of_property_read_u32(np, res_name, (u32 *)&pdata->mode);

		of_property_read_u32(np, res_name, (u32 *)&pdata->mode);

		of_property_read_u32(np, "power", (u32 *)&pdata->power);

		of_property_read_u32(np, "power", (u32 *)&pdata->power);

		config->multipoint = of_property_read_bool(np, "multipoint");

		config->multipoint = of_property_read_bool(np, "multipoint");

drivers/usb/renesas_usbhs/fifo.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -795,6 +795,7 @@ static void xfer_work(struct work_struct *work) 
	dev_dbg(dev, "  %s %d (%d/ %d)\n",

	dev_dbg(dev, "  %s %d (%d/ %d)\n",

		fifo->name, usbhs_pipe_number(pipe), pkt->length, pkt->zero);

		fifo->name, usbhs_pipe_number(pipe), pkt->length, pkt->zero);





	usbhs_pipe_enable(pipe);

	usbhsf_dma_start(pipe, fifo);

	usbhsf_dma_start(pipe, fifo);

	dma_async_issue_pending(chan);

	dma_async_issue_pending(chan);

}

}

drivers/usb/renesas_usbhs/mod_host.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -334,6 +334,11 @@ static void usbhsh_pipe_detach(struct usbhsh_hpriv *hpriv, 
	struct device *dev = usbhs_priv_to_dev(priv);

	struct device *dev = usbhs_priv_to_dev(priv);

	unsigned long flags;

	unsigned long flags;





	if (unlikely(!uep)) {

		dev_err(dev, "no uep\n");

		return;

	}



	/********************  spin lock ********************/

	/********************  spin lock ********************/

	usbhs_lock(priv, flags);

	usbhs_lock(priv, flags);