Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1662361 > unrolled thread

[PATCH] usb: mtu3: Handle return value of clk_prepare_enable

Back to article view | Back to linux.kernel

Contents

  [PATCH] usb: mtu3: Handle return value of clk_prepare_enable Arvind Yadav <arvind.yadav.cs@gmail.com> - 2017-06-09 14:10 +0200
    Re: [PATCH] usb: mtu3: Handle return value of clk_prepare_enable Matthias Brugger <matthias.bgg@gmail.com> - 2017-06-10 12:40 +0200

#1662361 — [PATCH] usb: mtu3: Handle return value of clk_prepare_enable

clk_prepare_enable() can fail here and we must check its return value.

Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
---
 drivers/usb/mtu3/mtu3_plat.c | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/mtu3/mtu3_plat.c b/drivers/usb/mtu3/mtu3_plat.c
index 42550c7..0d3ebb3 100644
--- a/drivers/usb/mtu3/mtu3_plat.c
+++ b/drivers/usb/mtu3/mtu3_plat.c
@@ -458,6 +458,7 @@ static int __maybe_unused mtu3_resume(struct device *dev)
 {
 	struct platform_device *pdev = to_platform_device(dev);
 	struct ssusb_mtk *ssusb = platform_get_drvdata(pdev);
+	int ret;
 
 	dev_dbg(dev, "%s\n", __func__);
 
@@ -465,12 +466,28 @@ static int __maybe_unused mtu3_resume(struct device *dev)
 		return 0;
 
 	ssusb_wakeup_disable(ssusb);
-	clk_prepare_enable(ssusb->sys_clk);
-	clk_prepare_enable(ssusb->ref_clk);
-	ssusb_phy_power_on(ssusb);
+	ret = clk_prepare_enable(ssusb->sys_clk);
+	if (ret)
+		goto err_sys_clk;
+
+	ret = clk_prepare_enable(ssusb->ref_clk);
+	if (ret)
+		goto err_ref_clk;
+
+	ret = ssusb_phy_power_on(ssusb);
+	if (ret)
+		goto err_power_on;
+
 	ssusb_host_enable(ssusb);
 
 	return 0;
+
+err_power_on:
+	clk_disable_unprepare(ssusb->ref_clk);
+err_ref_clk:
+	clk_disable_unprepare(ssusb->sys_clk);
+err_sys_clk:
+	return ret;
 }
 
 static const struct dev_pm_ops mtu3_pm_ops = {
-- 
1.9.1

[toc] | [next] | [standalone]

#1662934

On 09/06/17 14:03, Arvind Yadav wrote:
> clk_prepare_enable() can fail here and we must check its return value.
> 
> Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
> ---
>   drivers/usb/mtu3/mtu3_plat.c | 23 ++++++++++++++++++++---
>   1 file changed, 20 insertions(+), 3 deletions(-)
> 

Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>

> diff --git a/drivers/usb/mtu3/mtu3_plat.c b/drivers/usb/mtu3/mtu3_plat.c
> index 42550c7..0d3ebb3 100644
> --- a/drivers/usb/mtu3/mtu3_plat.c
> +++ b/drivers/usb/mtu3/mtu3_plat.c
> @@ -458,6 +458,7 @@ static int __maybe_unused mtu3_resume(struct device *dev)
>   {
>   	struct platform_device *pdev = to_platform_device(dev);
>   	struct ssusb_mtk *ssusb = platform_get_drvdata(pdev);
> +	int ret;
>   
>   	dev_dbg(dev, "%s\n", __func__);
>   
> @@ -465,12 +466,28 @@ static int __maybe_unused mtu3_resume(struct device *dev)
>   		return 0;
>   
>   	ssusb_wakeup_disable(ssusb);
> -	clk_prepare_enable(ssusb->sys_clk);
> -	clk_prepare_enable(ssusb->ref_clk);
> -	ssusb_phy_power_on(ssusb);
> +	ret = clk_prepare_enable(ssusb->sys_clk);
> +	if (ret)
> +		goto err_sys_clk;
> +
> +	ret = clk_prepare_enable(ssusb->ref_clk);
> +	if (ret)
> +		goto err_ref_clk;
> +
> +	ret = ssusb_phy_power_on(ssusb);
> +	if (ret)
> +		goto err_power_on;
> +
>   	ssusb_host_enable(ssusb);
>   
>   	return 0;
> +
> +err_power_on:
> +	clk_disable_unprepare(ssusb->ref_clk);
> +err_ref_clk:
> +	clk_disable_unprepare(ssusb->sys_clk);
> +err_sys_clk:
> +	return ret;
>   }
>   
>   static const struct dev_pm_ops mtu3_pm_ops = {
> 

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web