diff mbox series

usb: musb: mpfs: Fix error codes in probe()

Message ID YrVmLEc/FOEzNdzj@kili (mailing list archive)
State Accepted
Commit 21cdd6a0e8441461e549f0c25af9696c6c4de22c
Headers show
Series usb: musb: mpfs: Fix error codes in probe() | expand

Commit Message

Dan Carpenter June 24, 2022, 7:22 a.m. UTC 
These error paths return success but they need to return a negative
error code.

Fixes: 7a96b6ea90a4 ("usb: musb: Add support for PolarFire SoC's musb controller")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
 drivers/usb/musb/mpfs.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Conor Dooley June 24, 2022, 6:19 p.m. UTC | #1 
On 24/06/2022 08:22, Dan Carpenter wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
> 
> These error paths return success but they need to return a negative
> error code.
> 
> Fixes: 7a96b6ea90a4 ("usb: musb: Add support for PolarFire SoC's musb controller")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
>   drivers/usb/musb/mpfs.c | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/usb/musb/mpfs.c b/drivers/usb/musb/mpfs.c
> index 99666ef8af06..a69ca338eace 100644
> --- a/drivers/usb/musb/mpfs.c
> +++ b/drivers/usb/musb/mpfs.c
> @@ -181,8 +181,10 @@ static int mpfs_probe(struct platform_device *pdev)
>          glue->clk = clk;
> 
>          pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
> -       if (!pdata)
> +       if (!pdata) {
> +               ret = -ENOMEM;
>                  goto err_clk_disable;
> +       }
> 
>          pdata->config = &mpfs_musb_hdrc_config;
>          pdata->platform_ops = &mpfs_ops;
> @@ -197,6 +199,7 @@ static int mpfs_probe(struct platform_device *pdev)
>          if (IS_ERR(glue->phy)) {
>                  dev_err(dev, "failed to register usb-phy %ld\n",
>                          PTR_ERR(glue->phy));
> +               ret = PTR_ERR(glue->phy);
>                  goto err_clk_disable;
>          }
> 
> --
> 2.35.1
> 

Acked-by: Conor Dooley <conor.dooley@microchip.com>

Thanks Dan and sorry for the bother!
Conor.
diff mbox series

Patch

diff --git a/drivers/usb/musb/mpfs.c b/drivers/usb/musb/mpfs.c
index 99666ef8af06..a69ca338eace 100644
--- a/drivers/usb/musb/mpfs.c
+++ b/drivers/usb/musb/mpfs.c
@@ -181,8 +181,10 @@  static int mpfs_probe(struct platform_device *pdev)
 	glue->clk = clk;
 
 	pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
-	if (!pdata)
+	if (!pdata) {
+		ret = -ENOMEM;
 		goto err_clk_disable;
+	}
 
 	pdata->config = &mpfs_musb_hdrc_config;
 	pdata->platform_ops = &mpfs_ops;
@@ -197,6 +199,7 @@  static int mpfs_probe(struct platform_device *pdev)
 	if (IS_ERR(glue->phy)) {
 		dev_err(dev, "failed to register usb-phy %ld\n",
 			PTR_ERR(glue->phy));
+		ret = PTR_ERR(glue->phy);
 		goto err_clk_disable;
 	}