[PATCH] mtd: rawnand: fix drivers probe/remove methods

[wupeng (D)]

On 2022/5/19 23:25, Miquel Raynal wrote:
> Hi,
> 
> wupeng58 at huawei.com wrote on Tue, 17 May 2022 06:07:53 +0000:
> 
>> Driver should call pci_disable_device() if it returns from
>> cafe_nand_probe() with error.
>>
>> Meanwhile, the driver calls pci_enable_device() in
>> cafe_nand_probe(), but never calls pci_disable_device()
>> during removal.
> 
> Please fix the subject prefix, it should be "mtd: ranwnand: cafe:"
> 
> Also Fixes/Cc: stable tags might be useful.
> 
>> Signed-off-by: Peng Wu <wupeng58 at huawei.com>
>> ---
>>   drivers/mtd/nand/raw/cafe_nand.c | 9 +++++++--
>>   1 file changed, 7 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/mtd/nand/raw/cafe_nand.c b/drivers/mtd/nand/raw/cafe_nand.c
>> index 9dbf031716a6..af119e376352 100644
>> --- a/drivers/mtd/nand/raw/cafe_nand.c
>> +++ b/drivers/mtd/nand/raw/cafe_nand.c
>> @@ -679,8 +679,10 @@ static int cafe_nand_probe(struct pci_dev *pdev,
>>   	pci_set_master(pdev);
>>   
>>   	cafe = kzalloc(sizeof(*cafe), GFP_KERNEL);
>> -	if (!cafe)
>> -		return  -ENOMEM;
>> +	if (!cafe) {
>> +		err = -ENOMEM;
>> +		goto out_disable_device;
>> +	}
>>   
>>   	mtd = nand_to_mtd(&cafe->nand);
>>   	mtd->dev.parent = &pdev->dev;
>> @@ -801,6 +803,8 @@ static int cafe_nand_probe(struct pci_dev *pdev,
>>   	pci_iounmap(pdev, cafe->mmio);
>>    out_free_mtd:
>>   	kfree(cafe);
>> + out_disable_device:
>> +	pci_disable_device(pdev);
>>    out:
>>   	return err;
>>   }
>> @@ -822,6 +826,7 @@ static void cafe_nand_remove(struct pci_dev *pdev)
>>   	pci_iounmap(pdev, cafe->mmio);
>>   	dma_free_coherent(&cafe->pdev->dev, 2112, cafe->dmabuf, cafe->dmaaddr);
>>   	kfree(cafe);
>> +	pci_disable_device(pdev);
>>   }
>>   
>>   static const struct pci_device_id cafe_nand_tbl[] = {
> 
> 
> Thanks,
> Miquèl
> .
> 
Hi，
    Thank you very much for correcting the problem and I will fix the unqualified subject name.

Thanks,
Peng Wu