summaryrefslogtreecommitdiff
path: root/drivers/usb/cdns3/cdns3-pci-wrap.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-12-12 20:37:22 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-12-12 20:37:22 +0300
commitafab69dcd2367d658853a3520fb06d356ccabb7f (patch)
treeeadb66b0176308a9e57480f0675d81ef05b5d776 /drivers/usb/cdns3/cdns3-pci-wrap.c
parent9319aefb0f8805af379d375403b5ba48a0d3ef1b (diff)
parent53d3c6ddbb9749ebc06956a13ed6eead31402a7d (diff)
downloadlinux-afab69dcd2367d658853a3520fb06d356ccabb7f.tar.xz
Merge v6.12.62linux-rolling-lts
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/cdns3/cdns3-pci-wrap.c')
-rw-r--r--drivers/usb/cdns3/cdns3-pci-wrap.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/usb/cdns3/cdns3-pci-wrap.c b/drivers/usb/cdns3/cdns3-pci-wrap.c
index 591d149de8f3..c7a241cac488 100644
--- a/drivers/usb/cdns3/cdns3-pci-wrap.c
+++ b/drivers/usb/cdns3/cdns3-pci-wrap.c
@@ -100,10 +100,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;
@@ -162,7 +160,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;