Re: [PATCH] usb: ehci-spear: fix call balance of sehci clk handling routines

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, Nov 15, 2024 at 02:03:10AM +0300, Vitalii Mordan wrote:
> If the clock sehci->clk was not enabled in spear_ehci_hcd_drv_probe,
> it should not be disabled in any path.
> 
> Conversely, if it was enabled in spear_ehci_hcd_drv_probe, it must be disabled
> in all error paths to ensure proper cleanup.
> 
> Found by Linux Verification Center (linuxtesting.org) with Klever.
> 
> Fixes: 7675d6ba436f ("USB: EHCI: make ehci-spear a separate driver")
> Cc: stable@xxxxxxxxxxxxxxx
> Signed-off-by: Vitalii Mordan <mordan@xxxxxxxxx>
> ---

Acked-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>

>  drivers/usb/host/ehci-spear.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/usb/host/ehci-spear.c b/drivers/usb/host/ehci-spear.c
> index d0e94e4c9fe2..11294f196ee3 100644
> --- a/drivers/usb/host/ehci-spear.c
> +++ b/drivers/usb/host/ehci-spear.c
> @@ -105,7 +105,9 @@ static int spear_ehci_hcd_drv_probe(struct platform_device *pdev)
>  	/* registers start at offset 0x0 */
>  	hcd_to_ehci(hcd)->caps = hcd->regs;
>  
> -	clk_prepare_enable(sehci->clk);
> +	retval = clk_prepare_enable(sehci->clk);
> +	if (retval)
> +		goto err_put_hcd;
>  	retval = usb_add_hcd(hcd, irq, IRQF_SHARED);
>  	if (retval)
>  		goto err_stop_ehci;
> @@ -130,8 +132,7 @@ static void spear_ehci_hcd_drv_remove(struct platform_device *pdev)
>  
>  	usb_remove_hcd(hcd);
>  
> -	if (sehci->clk)
> -		clk_disable_unprepare(sehci->clk);
> +	clk_disable_unprepare(sehci->clk);
>  	usb_put_hcd(hcd);
>  }
>  
> -- 
> 2.25.1
> 




[Index of Archives]     [Linux Media]     [Linux Input]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Old Linux USB Devel Archive]

  Powered by Linux