diff mbox series

[v2] usb: gadget: udc: renesas_usb3: Fix RZ/V2M {modprobe,bind} error

Message ID 20230530161720.179927-1-biju.das.jz@bp.renesas.com (mailing list archive)
State Accepted
Commit 3e6ac852fbc71a234de24b5455086f6b98d3d958
Headers show
Series [v2] usb: gadget: udc: renesas_usb3: Fix RZ/V2M {modprobe,bind} error | expand

Commit Message

Biju Das May 30, 2023, 4:17 p.m. UTC
Currently {modprobe, bind} after {rmmod, unbind} results in probe failure.

genirq: Flags mismatch irq 22. 00000004 (85070400.usb3drd) vs. 00000004 (85070400.usb3drd)
renesas_usb3: probe of 85070000.usb3peri failed with error -16

The reason is, it is trying to register an interrupt handler for the same
IRQ twice. The devm_request_irq() was called with the parent device.
So the interrupt handler won't be unregistered when the usb3-peri device
is unbound.

Fix this issue by replacing "parent dev"->"dev" as the irq resource
is managed by this driver.

Fixes: 9cad72dfc556 ("usb: gadget: Add support for RZ/V2M USB3DRD driver")
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
---
v1->v2:
 * Added missing ')' at the end of the line for fixes tag.
 * Updated commit description.
 * Replaced "ddata->dev"->"&pdev->dev" for the devname parameter.
---
 drivers/usb/gadget/udc/renesas_usb3.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Geert Uytterhoeven May 31, 2023, 7:22 a.m. UTC | #1
On Tue, May 30, 2023 at 6:17 PM Biju Das <biju.das.jz@bp.renesas.com> wrote:
> Currently {modprobe, bind} after {rmmod, unbind} results in probe failure.
>
> genirq: Flags mismatch irq 22. 00000004 (85070400.usb3drd) vs. 00000004 (85070400.usb3drd)
> renesas_usb3: probe of 85070000.usb3peri failed with error -16
>
> The reason is, it is trying to register an interrupt handler for the same
> IRQ twice. The devm_request_irq() was called with the parent device.
> So the interrupt handler won't be unregistered when the usb3-peri device
> is unbound.
>
> Fix this issue by replacing "parent dev"->"dev" as the irq resource
> is managed by this driver.
>
> Fixes: 9cad72dfc556 ("usb: gadget: Add support for RZ/V2M USB3DRD driver")
> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> ---
> v1->v2:
>  * Added missing ')' at the end of the line for fixes tag.
>  * Updated commit description.
>  * Replaced "ddata->dev"->"&pdev->dev" for the devname parameter.

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

Gr{oetje,eeting}s,

                        Geert
diff mbox series

Patch

diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c
index aac8bc185afa..eb008e873361 100644
--- a/drivers/usb/gadget/udc/renesas_usb3.c
+++ b/drivers/usb/gadget/udc/renesas_usb3.c
@@ -2877,9 +2877,9 @@  static int renesas_usb3_probe(struct platform_device *pdev)
 		struct rzv2m_usb3drd *ddata = dev_get_drvdata(pdev->dev.parent);
 
 		usb3->drd_reg = ddata->reg;
-		ret = devm_request_irq(ddata->dev, ddata->drd_irq,
+		ret = devm_request_irq(&pdev->dev, ddata->drd_irq,
 				       renesas_usb3_otg_irq, 0,
-				       dev_name(ddata->dev), usb3);
+				       dev_name(&pdev->dev), usb3);
 		if (ret < 0)
 			return ret;
 	}