2021-06-16 03:51:38

by Zou Wei

Subject: [PATCH -next] mtd: rawnand: arasan: Fix missing clk_disable_unprepare() on error in anfc_probe()

Fix the missing clk_disable_unprepare() before return
from anfc_probe() in the error handling case.

Fixes: 61622f6791a1 ("mtd: rawnand: arasan: Use the right DMA mask")
Reported-by: Hulk Robot <[email protected]>
Signed-off-by: Zou Wei <[email protected]>
---
drivers/mtd/nand/raw/arasan-nand-controller.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/raw/arasan-nand-controller.c b/drivers/mtd/nand/raw/arasan-nand-controller.c
index 8317d97..9cbcc69 100644
--- a/drivers/mtd/nand/raw/arasan-nand-controller.c
+++ b/drivers/mtd/nand/raw/arasan-nand-controller.c
@@ -1452,7 +1452,7 @@ static int anfc_probe(struct platform_device *pdev)

ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
if (ret)
- return ret;
+ goto disable_bus_clk;

ret = anfc_parse_cs(nfc);
if (ret)
--
2.6.2

2021-06-18 10:42:38

by Miquel Raynal

Subject: Re: [PATCH -next] mtd: rawnand: arasan: Fix missing clk_disable_unprepare() on error in anfc_probe()

Hi Zou,

Zou Wei <[email protected]> wrote on Wed, 16 Jun 2021 12:06:44 +0800:

> Fix the missing clk_disable_unprepare() before return
> from anfc_probe() in the error handling case.
>
> Fixes: 61622f6791a1 ("mtd: rawnand: arasan: Use the right DMA mask")
> Reported-by: Hulk Robot <[email protected]>
> Signed-off-by: Zou Wei <[email protected]>

Thanks for the patch, 61622f6791a1 being problematic because of the
mask not being correctly declared I prefer to fix this patch inline and
if you don't mind I'll include the goto change as well.

> ---
> drivers/mtd/nand/raw/arasan-nand-controller.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mtd/nand/raw/arasan-nand-controller.c b/drivers/mtd/nand/raw/arasan-nand-controller.c
> index 8317d97..9cbcc69 100644
> --- a/drivers/mtd/nand/raw/arasan-nand-controller.c
> +++ b/drivers/mtd/nand/raw/arasan-nand-controller.c
> @@ -1452,7 +1452,7 @@ static int anfc_probe(struct platform_device *pdev)
>
> ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
> if (ret)
> - return ret;
> + goto disable_bus_clk;
>
> ret = anfc_parse_cs(nfc);
> if (ret)

Thanks,
Miquèl

2021-06-18 13:00:04

by Zou Wei

Subject: Re: [PATCH -next] mtd: rawnand: arasan: Fix missing clk_disable_unprepare() on error in anfc_probe()

Hi Miquel,

Thanks for your review, and it's OK include the goto change.

On 2021/6/18 15:27, Miquel Raynal wrote:
> Hi Zou,
>
> Zou Wei <[email protected]> wrote on Wed, 16 Jun 2021 12:06:44 +0800:
>
>> Fix the missing clk_disable_unprepare() before return
>> from anfc_probe() in the error handling case.
>>
>> Fixes: 61622f6791a1 ("mtd: rawnand: arasan: Use the right DMA mask")
>> Reported-by: Hulk Robot <[email protected]>
>> Signed-off-by: Zou Wei <[email protected]>
>
> Thanks for the patch, 61622f6791a1 being problematic because of the
> mask not being correctly declared I prefer to fix this patch inline and
> if you don't mind I'll include the goto change as well.
>
>> ---
>> drivers/mtd/nand/raw/arasan-nand-controller.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/mtd/nand/raw/arasan-nand-controller.c b/drivers/mtd/nand/raw/arasan-nand-controller.c
>> index 8317d97..9cbcc69 100644
>> --- a/drivers/mtd/nand/raw/arasan-nand-controller.c
>> +++ b/drivers/mtd/nand/raw/arasan-nand-controller.c
>> @@ -1452,7 +1452,7 @@ static int anfc_probe(struct platform_device *pdev)
>>
>> ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
>> if (ret)
>> - return ret;
>> + goto disable_bus_clk;
>>
>> ret = anfc_parse_cs(nfc);
>> if (ret)
>
> Thanks,
> Miquèl
> .
>