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

Commit 2c37b2f4 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

USB: omap_udc: use devm_request_irq() 



[ Upstream commit 286afdde1640d8ea8916a0f05e811441fbbf4b9d ]

The current code fails to release the third irq on the error path
(observed by reading the code), and we get also multiple WARNs with
failing gadget drivers due to duplicate IRQ releases. Fix by using
devm_request_irq().

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3d7eec16

drivers/usb/gadget/udc/omap_udc.c

+10 −27
Original line number Diff line number Diff line
@@ -2886,8 +2886,8 @@ static int omap_udc_probe(struct platform_device *pdev) 
		udc->clr_halt = UDC_RESET_EP;



	/* USB general purpose IRQ:  ep0, state changes, dma, etc */

	status = request_irq(pdev->resource[1].start, omap_udc_irq,

			0, driver_name, udc);

	status = devm_request_irq(&pdev->dev, pdev->resource[1].start,

				  omap_udc_irq, 0, driver_name, udc);

	if (status != 0) {

		ERR("can't get irq %d, err %d\n",

			(int) pdev->resource[1].start, status);
@@ -2895,20 +2895,20 @@ static int omap_udc_probe(struct platform_device *pdev) 
	}



	/* USB "non-iso" IRQ (PIO for all but ep0) */

	status = request_irq(pdev->resource[2].start, omap_udc_pio_irq,

			0, "omap_udc pio", udc);

	status = devm_request_irq(&pdev->dev, pdev->resource[2].start,

				  omap_udc_pio_irq, 0, "omap_udc pio", udc);

	if (status != 0) {

		ERR("can't get irq %d, err %d\n",

			(int) pdev->resource[2].start, status);

		goto cleanup2;

		goto cleanup1;

	}

#ifdef	USE_ISO

	status = request_irq(pdev->resource[3].start, omap_udc_iso_irq,

			0, "omap_udc iso", udc);

	status = devm_request_irq(&pdev->dev, pdev->resource[3].start,

				  omap_udc_iso_irq, 0, "omap_udc iso", udc);

	if (status != 0) {

		ERR("can't get irq %d, err %d\n",

			(int) pdev->resource[3].start, status);

		goto cleanup3;

		goto cleanup1;

	}

#endif

	if (cpu_is_omap16xx() || cpu_is_omap7xx()) {
@@ -2921,22 +2921,11 @@ static int omap_udc_probe(struct platform_device *pdev) 
	create_proc_file();

	status = usb_add_gadget_udc_release(&pdev->dev, &udc->gadget,

			omap_udc_release);

	if (status)

		goto cleanup4;



	if (!status)

		return 0;



cleanup4:

	remove_proc_file();



#ifdef	USE_ISO

cleanup3:

	free_irq(pdev->resource[2].start, udc);

#endif



cleanup2:

	free_irq(pdev->resource[1].start, udc);



cleanup1:

	kfree(udc);

	udc = NULL;
@@ -2980,12 +2969,6 @@ static int omap_udc_remove(struct platform_device *pdev) 


	remove_proc_file();



#ifdef	USE_ISO

	free_irq(pdev->resource[3].start, udc);

#endif

	free_irq(pdev->resource[2].start, udc);

	free_irq(pdev->resource[1].start, udc);



	if (udc->dc_clk) {

		if (udc->clk_requested)

			omap_udc_enable_clock(0);