2023-10-07 07:27:29

by Ma Ke

Subject: [PATCH] ata: sata_mv: aspeed: fix value check in mv_platform_probe()

In mv_platform_probe(), check the return value of clk_prepare_enable()
and return the error code if clk_prepare_enable() returns an
unexpected value.

Signed-off-by: Ma Ke <[email protected]>
---
drivers/ata/sata_mv.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 45e48d653c60..96f9841aae6c 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -4125,8 +4125,11 @@ static int mv_platform_probe(struct platform_device *pdev)
hpriv->clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(hpriv->clk))
dev_notice(&pdev->dev, "cannot get optional clkdev\n");
- else
- clk_prepare_enable(hpriv->clk);
+ else {
+ rc = clk_prepare_enable(hpriv->clk);
+ if (rc)
+ return rc;
+ }

for (port = 0; port < n_ports; port++) {
char port_number[16];
--
2.37.2

2023-10-09 10:13:14

by Niklas Cassel

Subject: Re: [PATCH] ata: sata_mv: aspeed: fix value check in mv_platform_probe()

On Sat, Oct 07, 2023 at 03:26:57PM +0800, Ma Ke wrote:
> In mv_platform_probe(), check the return value of clk_prepare_enable()
> and return the error code if clk_prepare_enable() returns an
> unexpected value.
>
> Signed-off-by: Ma Ke <[email protected]>
> ---
> drivers/ata/sata_mv.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
> index 45e48d653c60..96f9841aae6c 100644
> --- a/drivers/ata/sata_mv.c
> +++ b/drivers/ata/sata_mv.c
> @@ -4125,8 +4125,11 @@ static int mv_platform_probe(struct platform_device *pdev)
> hpriv->clk = clk_get(&pdev->dev, NULL);
> if (IS_ERR(hpriv->clk))
> dev_notice(&pdev->dev, "cannot get optional clkdev\n");
> - else
> - clk_prepare_enable(hpriv->clk);
> + else {
> + rc = clk_prepare_enable(hpriv->clk);
> + if (rc)
> + return rc;

Don't you also need to call clk_put() to undo the clk_get()?

Can this error path perhaps simply do a goto err?


Kind regards,
Niklas