| Message ID | 20210221074133.938017-1-christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/2] usb: gadget: s3c: Fix incorrect resources releasing | expand |
On Sun, Feb 21, 2021 at 08:41:33AM +0100, Christophe JAILLET wrote: > Some 'clk_prepare_enable()' and 'clk_get()' must be undone in the error > handling path of the probe function, as already done in the remove > function. > > Fixes: 1c6d47aa4f4b ("USB Gadget driver for Samsung s3c2410 ARM SoC") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- > checkpatch reports: > WARNING: Unknown commit id '1c6d47aa4f4b', maybe rebased or not pulled? > According to https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/drivers/usb/gadget/s3c2410_udc.c?id=3fc154b6b8134b98bb94d60cad9a46ec1ffbe372 > the commit ID looks correct to me. Maybe something should be tweaked somewhere > before applying, but I don't know what! Same thing. The hash is 3fc154b6b8134b98bb94d60cad9a46ec1ffbe372 regards, dan carpenter
On 21/02/2021 08:41, Christophe JAILLET wrote: > Some 'clk_prepare_enable()' and 'clk_get()' must be undone in the error > handling path of the probe function, as already done in the remove > function. > > Fixes: 1c6d47aa4f4b ("USB Gadget driver for Samsung s3c2410 ARM SoC") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- > checkpatch reports: > WARNING: Unknown commit id '1c6d47aa4f4b', maybe rebased or not pulled? > According to https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/drivers/usb/gadget/s3c2410_udc.c?id=3fc154b6b8134b98bb94d60cad9a46ec1ffbe372 > the commit ID looks correct to me. Maybe something should be tweaked somewhere > before applying, but I don't know what! > --- > drivers/usb/gadget/udc/s3c2410_udc.c | 16 ++++++++++++---- > 1 file changed, 12 insertions(+), 4 deletions(-) > After fixing commit sha: Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Best regards, Krzysztof
diff --git a/drivers/usb/gadget/udc/s3c2410_udc.c b/drivers/usb/gadget/udc/s3c2410_udc.c index 3fc436286bad..146250e93412 100644 --- a/drivers/usb/gadget/udc/s3c2410_udc.c +++ b/drivers/usb/gadget/udc/s3c2410_udc.c @@ -1750,7 +1750,8 @@ static int s3c2410_udc_probe(struct platform_device *pdev) udc_clock = clk_get(NULL, "usb-device"); if (IS_ERR(udc_clock)) { dev_err(dev, "failed to get udc clock source\n"); - return PTR_ERR(udc_clock); + retval = PTR_ERR(udc_clock); + goto err_usb_bus_clk; } clk_prepare_enable(udc_clock); @@ -1773,7 +1774,7 @@ static int s3c2410_udc_probe(struct platform_device *pdev) base_addr = devm_platform_ioremap_resource(pdev, 0); if (!base_addr) { retval = -ENOMEM; - goto err; + goto err_udc_clk; } the_controller = udc; @@ -1791,7 +1792,7 @@ static int s3c2410_udc_probe(struct platform_device *pdev) if (retval != 0) { dev_err(dev, "cannot get irq %i, err %d\n", irq_usbd, retval); retval = -EBUSY; - goto err; + goto err_udc_clk; } dev_dbg(dev, "got irq %i\n", irq_usbd); @@ -1862,7 +1863,14 @@ static int s3c2410_udc_probe(struct platform_device *pdev) gpio_free(udc_info->vbus_pin); err_int: free_irq(irq_usbd, udc); -err: +err_udc_clk: + clk_disable_unprepare(udc_clock); + clk_put(udc_clock); + udc_clock = NULL; +err_usb_bus_clk: + clk_disable_unprepare(usb_bus_clock); + clk_put(usb_bus_clock); + usb_bus_clock = NULL; return retval; }
Some 'clk_prepare_enable()' and 'clk_get()' must be undone in the error handling path of the probe function, as already done in the remove function. Fixes: 1c6d47aa4f4b ("USB Gadget driver for Samsung s3c2410 ARM SoC") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- checkpatch reports: WARNING: Unknown commit id '1c6d47aa4f4b', maybe rebased or not pulled? According to https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/drivers/usb/gadget/s3c2410_udc.c?id=3fc154b6b8134b98bb94d60cad9a46ec1ffbe372 the commit ID looks correct to me. Maybe something should be tweaked somewhere before applying, but I don't know what! --- drivers/usb/gadget/udc/s3c2410_udc.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)