[PATCH] usb: cdns3: Fix double resource release in cdns3_pci_probe

[PATCH] usb: cdns3: Fix double resource release in cdns3_pci_probe

[Miaoqian Lin]

The driver uses pcim_enable_device() to enable the PCI device,
the device will be automatically disabled on driver detach through
the managed device framework. The manual pci_disable_device() calls
in the error paths are therefore redundant and should be removed.

Found via static anlaysis and this is similar to commit 99ca0b57e49f
("thermal: intel: int340x: processor: Fix warning during module unload").

Fixes: 7733f6c32e36 ("usb: cdns3: Add Cadence USB3 DRD Driver")
Cc: stable@vger.kernel.org
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
---
 drivers/usb/cdns3/cdns3-pci-wrap.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/usb/cdns3/cdns3-pci-wrap.c b/drivers/usb/cdns3/cdns3-pci-wrap.c
index 3b3b3dc75f35..57f57c24c663 100644
--- a/drivers/usb/cdns3/cdns3-pci-wrap.c
+++ b/drivers/usb/cdns3/cdns3-pci-wrap.c
@@ -98,10 +98,8 @@ static int cdns3_pci_probe(struct pci_dev *pdev,
 		wrap = pci_get_drvdata(func);
 	} else {
 		wrap = kzalloc(sizeof(*wrap), GFP_KERNEL);
-		if (!wrap) {
-			pci_disable_device(pdev);
+		if (!wrap)
 			return -ENOMEM;
-		}
 	}
 
 	res = wrap->dev_res;
@@ -160,7 +158,6 @@ static int cdns3_pci_probe(struct pci_dev *pdev,
 		/* register platform device */
 		wrap->plat_dev = platform_device_register_full(&plat_info);
 		if (IS_ERR(wrap->plat_dev)) {
-			pci_disable_device(pdev);
 			err = PTR_ERR(wrap->plat_dev);
 			kfree(wrap);
 			return err;
-- 
2.39.5 (Apple Git-154)

Re: [PATCH] usb: cdns3: Fix double resource release in cdns3_pci_probe

[Peter Chen (CIX)]

On 25-10-26 17:08:59, Miaoqian Lin wrote:
> The driver uses pcim_enable_device() to enable the PCI device,
> the device will be automatically disabled on driver detach through
> the managed device framework. The manual pci_disable_device() calls
> in the error paths are therefore redundant and should be removed.
> 
> Found via static anlaysis and this is similar to commit 99ca0b57e49f
> ("thermal: intel: int340x: processor: Fix warning during module unload").
> 
> Fixes: 7733f6c32e36 ("usb: cdns3: Add Cadence USB3 DRD Driver")
> Cc: stable@vger.kernel.org
> Signed-off-by: Miaoqian Lin <linmq006@gmail.com>

Acked-by: Peter Chen <peter.chen@kernel.org>

Peter
> ---
>  drivers/usb/cdns3/cdns3-pci-wrap.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/drivers/usb/cdns3/cdns3-pci-wrap.c b/drivers/usb/cdns3/cdns3-pci-wrap.c
> index 3b3b3dc75f35..57f57c24c663 100644
> --- a/drivers/usb/cdns3/cdns3-pci-wrap.c
> +++ b/drivers/usb/cdns3/cdns3-pci-wrap.c
> @@ -98,10 +98,8 @@ static int cdns3_pci_probe(struct pci_dev *pdev,
>  		wrap = pci_get_drvdata(func);
>  	} else {
>  		wrap = kzalloc(sizeof(*wrap), GFP_KERNEL);
> -		if (!wrap) {
> -			pci_disable_device(pdev);
> +		if (!wrap)
>  			return -ENOMEM;
> -		}
>  	}
>  
>  	res = wrap->dev_res;
> @@ -160,7 +158,6 @@ static int cdns3_pci_probe(struct pci_dev *pdev,
>  		/* register platform device */
>  		wrap->plat_dev = platform_device_register_full(&plat_info);
>  		if (IS_ERR(wrap->plat_dev)) {
> -			pci_disable_device(pdev);
>  			err = PTR_ERR(wrap->plat_dev);
>  			kfree(wrap);
>  			return err;
> -- 
> 2.39.5 (Apple Git-154)
> 

-- 

Best regards,
Peter