| Message ID | 20221120061242.261839-1-cuigaosheng1@huawei.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | usb: gadget: fusb300_udc: free irq on the error path in fusb300_probe() | expand |
On Sun, Nov 20, 2022 at 2:25 PM Gaosheng Cui <cuigaosheng1@huawei.com> wrote: > > When request_irq(ires1->start) failed in w5300_hw_probe(), irq ires->start > has not been freed, and on the clean_up3 error path, we need to free > ires1->start irq, too. Fix it. > > Fixes: 0fe6f1d1f612 ("usb: udc: add Faraday fusb300 driver") > Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com> > --- > drivers/usb/gadget/udc/fusb300_udc.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/usb/gadget/udc/fusb300_udc.c b/drivers/usb/gadget/udc/fusb300_udc.c > index 9af8b415f303..c66a59c15003 100644 > --- a/drivers/usb/gadget/udc/fusb300_udc.c > +++ b/drivers/usb/gadget/udc/fusb300_udc.c > @@ -1432,7 +1432,7 @@ static int fusb300_probe(struct platform_device *pdev) > IRQF_SHARED, udc_name, fusb300); > if (ret < 0) { > pr_err("request_irq1 error (%d)\n", ret); > - goto clean_up; > + goto clean_up2; > } > > INIT_LIST_HEAD(&fusb300->gadget.ep_list); > @@ -1487,8 +1487,9 @@ static int fusb300_probe(struct platform_device *pdev) > fusb300_free_request(&fusb300->ep[0]->ep, fusb300->ep0_req); > > clean_up3: > + free_irq(ires1->start, fusb300); Hi Gaosheng, it seems you need to add the same free_irq in the .remove function. Refer to the following patch, --- a/drivers/usb/gadget/udc/fusb300_udc.c +++ b/drivers/usb/gadget/udc/fusb300_udc.c @@ -1347,6 +1347,7 @@ static int fusb300_remove(struct platform_device *pdev) usb_del_gadget_udc(&fusb300->gadget); iounmap(fusb300->reg); free_irq(platform_get_irq(pdev, 0), fusb300); + free_irq(platform_get_irq(pdev, 1), fusb300); fusb300_free_request(&fusb300->ep[0]->ep, fusb300->ep0_req); for (i = 0; i < FUSB300_MAX_NUM_EP; i++) Fix me if I make any mistakes. > +clean_up2: > free_irq(ires->start, fusb300); > - > clean_up: > if (fusb300) { > if (fusb300->ep0_req) > -- > 2.25.1 >
> it seems you need to add the same free_irq in the .remove function. > Refer to the following patch, > > --- a/drivers/usb/gadget/udc/fusb300_udc.c > +++ b/drivers/usb/gadget/udc/fusb300_udc.c > @@ -1347,6 +1347,7 @@ static int fusb300_remove(struct platform_device *pdev) > usb_del_gadget_udc(&fusb300->gadget); > iounmap(fusb300->reg); > free_irq(platform_get_irq(pdev, 0), fusb300); > + free_irq(platform_get_irq(pdev, 1), fusb300); > > fusb300_free_request(&fusb300->ep[0]->ep, fusb300->ep0_req); > for (i = 0; i < FUSB300_MAX_NUM_EP; i++) Thanks for taking time to review this patch, I have made a patch v2 and submit it. On 2022/11/20 19:01, Dongliang Mu wrote: > On Sun, Nov 20, 2022 at 2:25 PM Gaosheng Cui <cuigaosheng1@huawei.com> wrote: >> When request_irq(ires1->start) failed in w5300_hw_probe(), irq ires->start >> has not been freed, and on the clean_up3 error path, we need to free >> ires1->start irq, too. Fix it. >> >> Fixes: 0fe6f1d1f612 ("usb: udc: add Faraday fusb300 driver") >> Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com> >> --- >> drivers/usb/gadget/udc/fusb300_udc.c | 5 +++-- >> 1 file changed, 3 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/usb/gadget/udc/fusb300_udc.c b/drivers/usb/gadget/udc/fusb300_udc.c >> index 9af8b415f303..c66a59c15003 100644 >> --- a/drivers/usb/gadget/udc/fusb300_udc.c >> +++ b/drivers/usb/gadget/udc/fusb300_udc.c >> @@ -1432,7 +1432,7 @@ static int fusb300_probe(struct platform_device *pdev) >> IRQF_SHARED, udc_name, fusb300); >> if (ret < 0) { >> pr_err("request_irq1 error (%d)\n", ret); >> - goto clean_up; >> + goto clean_up2; >> } >> >> INIT_LIST_HEAD(&fusb300->gadget.ep_list); >> @@ -1487,8 +1487,9 @@ static int fusb300_probe(struct platform_device *pdev) >> fusb300_free_request(&fusb300->ep[0]->ep, fusb300->ep0_req); >> >> clean_up3: >> + free_irq(ires1->start, fusb300); > Hi Gaosheng, > > it seems you need to add the same free_irq in the .remove function. > Refer to the following patch, > > --- a/drivers/usb/gadget/udc/fusb300_udc.c > +++ b/drivers/usb/gadget/udc/fusb300_udc.c > @@ -1347,6 +1347,7 @@ static int fusb300_remove(struct platform_device *pdev) > usb_del_gadget_udc(&fusb300->gadget); > iounmap(fusb300->reg); > free_irq(platform_get_irq(pdev, 0), fusb300); > + free_irq(platform_get_irq(pdev, 1), fusb300); > > fusb300_free_request(&fusb300->ep[0]->ep, fusb300->ep0_req); > for (i = 0; i < FUSB300_MAX_NUM_EP; i++) > > Fix me if I make any mistakes. > >> +clean_up2: >> free_irq(ires->start, fusb300); >> - >> clean_up: >> if (fusb300) { >> if (fusb300->ep0_req) >> -- >> 2.25.1 >> > .
diff --git a/drivers/usb/gadget/udc/fusb300_udc.c b/drivers/usb/gadget/udc/fusb300_udc.c index 9af8b415f303..c66a59c15003 100644 --- a/drivers/usb/gadget/udc/fusb300_udc.c +++ b/drivers/usb/gadget/udc/fusb300_udc.c @@ -1432,7 +1432,7 @@ static int fusb300_probe(struct platform_device *pdev) IRQF_SHARED, udc_name, fusb300); if (ret < 0) { pr_err("request_irq1 error (%d)\n", ret); - goto clean_up; + goto clean_up2; } INIT_LIST_HEAD(&fusb300->gadget.ep_list); @@ -1487,8 +1487,9 @@ static int fusb300_probe(struct platform_device *pdev) fusb300_free_request(&fusb300->ep[0]->ep, fusb300->ep0_req); clean_up3: + free_irq(ires1->start, fusb300); +clean_up2: free_irq(ires->start, fusb300); - clean_up: if (fusb300) { if (fusb300->ep0_req)
When request_irq(ires1->start) failed in w5300_hw_probe(), irq ires->start has not been freed, and on the clean_up3 error path, we need to free ires1->start irq, too. Fix it. Fixes: 0fe6f1d1f612 ("usb: udc: add Faraday fusb300 driver") Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com> --- drivers/usb/gadget/udc/fusb300_udc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)