linux-kernel - Re: [PATCH 2/6] usb: bdc: Cleanup clock support

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Fri, 21 Jun 2019 13:26:20 +0800
From:   Chunfeng Yun <chunfeng.yun@...iatek.com>
To:     Al Cooper <alcooperx@...il.com>
CC:     <linux-kernel@...r.kernel.org>, <devicetree@...r.kernel.org>,
        Felipe Balbi <balbi@...nel.org>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        <linux-usb@...r.kernel.org>, Luis Chamberlain <mcgrof@...nel.org>,
        "Mark Rutland" <mark.rutland@....com>,
        Rob Herring <robh+dt@...nel.org>
Subject: Re: [PATCH 2/6] usb: bdc: Cleanup clock support

On Thu, 2019-06-20 at 17:09 -0400, Al Cooper wrote:
> - Fix driver to defer on clk_get defer
> 
> Signed-off-by: Al Cooper <alcooperx@...il.com>
> ---
>  drivers/usb/gadget/udc/bdc/bdc_core.c | 15 +++++++++------
>  1 file changed, 9 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/usb/gadget/udc/bdc/bdc_core.c b/drivers/usb/gadget/udc/bdc/bdc_core.c
> index ccbd1d34eb2a..11a43de6c1c6 100644
> --- a/drivers/usb/gadget/udc/bdc/bdc_core.c
> +++ b/drivers/usb/gadget/udc/bdc/bdc_core.c
> @@ -490,8 +490,14 @@ static int bdc_probe(struct platform_device *pdev)
>  
>  	dev_dbg(dev, "%s()\n", __func__);
>  
> +	bdc = devm_kzalloc(dev, sizeof(*bdc), GFP_KERNEL);
> +	if (!bdc)
> +		return -ENOMEM;
> +
>  	clk = devm_clk_get(dev, "sw_usbd");
>  	if (IS_ERR(clk)) {
> +		if (PTR_ERR(clk) == -EPROBE_DEFER)
> +			return -EPROBE_DEFER;
what about using devm_clk_get_optional()?

>  		dev_info(dev, "Clock not found in Device Tree\n");
>  		clk = NULL;
>  	}
> @@ -501,11 +507,6 @@ static int bdc_probe(struct platform_device *pdev)
>  		dev_err(dev, "could not enable clock\n");
>  		return ret;
>  	}
> -
> -	bdc = devm_kzalloc(dev, sizeof(*bdc), GFP_KERNEL);
> -	if (!bdc)
> -		return -ENOMEM;
> -
>  	bdc->clk = clk;
>  
>  	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> @@ -551,7 +552,7 @@ static int bdc_probe(struct platform_device *pdev)
>  	ret = bdc_phy_init(bdc);
>  	if (ret) {
>  		dev_err(bdc->dev, "BDC phy init failure:%d\n", ret);
> -		return ret;
> +		goto clk_cleanup;
>  	}
>  
>  	temp = bdc_readl(bdc->regs, BDC_BDCCAP1);
> @@ -583,6 +584,8 @@ static int bdc_probe(struct platform_device *pdev)
>  	bdc_hw_exit(bdc);
>  phycleanup:
>  	bdc_phy_exit(bdc);
> +clk_cleanup:
> +	clk_disable_unprepare(bdc->clk);
>  	return ret;
>  }
>