RE: [PATCH] usb: gadget: udc-xilinx: Fix an error handling path in 'xudc_probe()'

From: Shubhrajyoti Datta
Date: Sun Nov 07 2021 - 23:49:51 EST




> -----Original Message-----
> From: Christophe JAILLET <christophe.jaillet@xxxxxxxxxx>
> Sent: Sunday, November 7, 2021 9:56 PM
> To: balbi@xxxxxxxxxx; gregkh@xxxxxxxxxxxxxxxxxxx; Michal Simek
> <michals@xxxxxxxxxx>; lee.jones@xxxxxxxxxx; jiapeng.chong@xxxxxxxxxxxxxxxxx;
> abaci-bugfix@xxxxxxxxxxxxxxxxx; Shubhrajyoti Datta <shubhraj@xxxxxxxxxx>
> Cc: linux-usb@xxxxxxxxxxxxxxx; linux-arm-kernel@xxxxxxxxxxxxxxxxxxx; linux-
> kernel@xxxxxxxxxxxxxxx; kernel-janitors@xxxxxxxxxxxxxxx; Christophe JAILLET
> <christophe.jaillet@xxxxxxxxxx>
> Subject: [PATCH] usb: gadget: udc-xilinx: Fix an error handling path in
> 'xudc_probe()'
>
> A successful 'clk_prepare_enable()' call should be balanced by a corresponding
> 'clk_disable_unprepare()' call in the error handling path of the probe, as already
> done in the remove function.
>
Reviewed-by: Shubhrajyoti Datta <shubhraj@xxxxxxxxxx>

> Fixes: 24749229211c ("usb: gadget: udc-xilinx: Add clock support")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@xxxxxxxxxx>
> ---
> drivers/usb/gadget/udc/udc-xilinx.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/gadget/udc/udc-xilinx.c b/drivers/usb/gadget/udc/udc-
> xilinx.c
> index f5ca670776a3..857159dd5ae0 100644
> --- a/drivers/usb/gadget/udc/udc-xilinx.c
> +++ b/drivers/usb/gadget/udc/udc-xilinx.c
> @@ -2136,7 +2136,7 @@ static int xudc_probe(struct platform_device *pdev)
>
> ret = usb_add_gadget_udc(&pdev->dev, &udc->gadget);
> if (ret)
> - goto fail;
> + goto err_disable_unprepare_clk;
>
> udc->dev = &udc->gadget.dev;
>
> @@ -2155,6 +2155,9 @@ static int xudc_probe(struct platform_device *pdev)
> udc->dma_enabled ? "with DMA" : "without DMA");
>
> return 0;
> +
> +err_disable_unprepare_clk:
> + clk_disable_unprepare(udc->clk);
> fail:
> dev_err(&pdev->dev, "probe failed, %d\n", ret);
> return ret;
> --
> 2.30.2