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

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

[Zou Wei]

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 <hulkci@huawei.com>
Signed-off-by: Zou Wei <zou_wei@huawei.com>
---
 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

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

[Miquel Raynal]

Hi Zou,

Zou Wei <zou_wei@huawei.com> 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 <hulkci@huawei.com>
> Signed-off-by: Zou Wei <zou_wei@huawei.com>

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

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

[Samuel Zou]

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 <zou_wei@huawei.com> 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 <hulkci@huawei.com>
>> Signed-off-by: Zou Wei <zou_wei@huawei.com>
> 
> 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
> .
>