Skip to contentSkip to conversation

PCIe portdrv: eliminate double kfree in remove path

PATCH Applied Alex Chiang 3 participants 3 messages Mar 9, 2009 – Mar 20, 2009 PCI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 PCIe portdrv: eliminate double kfree in remove path

Commit 55633af3 (PCIe portdrv: Use driver data to simplify code) added a kfree of the driver private data in pcie_port_device_remove but forgot to remove the old kfree from pcie_portdrv_remove.

---

drivers/pci/pcie/portdrv_pci.c +0 -1
index a6fee6c..f2368b1 100644
@@ -93,7 +93,6 @@ static int __devinit pcie_portdrv_probe (struct pci_dev *dev,
 static void pcie_portdrv_remove (struct pci_dev *dev)
 {
 	pcie_port_device_remove(dev);
-	kfree(pci_get_drvdata(dev));
 }
 
 static int error_detected_iter(struct device *device, void *data)
#1 lore raw
Quoted 3 lines · Alex Chiang

Commit 55633af3 (PCIe portdrv: Use driver data to simplify code) added a kfree of the driver private data in pcie_port_device_remove but forgot to remove the old kfree from pcie_portdrv_remove.

Ah, sorry for that, it resulted in quite a lot of debugging work for you. :-(

Quoted 1 line

Acked-by; Rafael J. Wysocki <[email protected]>

Quoted 14 lines

---

drivers/pci/pcie/portdrv_pci.c +0 -2
index a6fee6c..f2368b1 100644
@@ -93,7 +93,6 @@ static int __devinit pcie_portdrv_probe (struct pci_dev *dev,
 static void pcie_portdrv_remove (struct pci_dev *dev)
 {
 	pcie_port_device_remove(dev);
-	kfree(pci_get_drvdata(dev));
 }
 
 static int error_detected_iter(struct device *device, void *data)
--
Applied
#2 lore raw
In reply to Alex Chiang
Quoted 5 lines · On Mon, 9 Mar 2009 12:08:15 -0600 Alex Chiang <[email protected]> wrote:

Commit 55633af3 (PCIe portdrv: Use driver data to simplify code) added a kfree of the driver private data in pcie_port_device_remove but forgot to remove the old kfree from pcie_portdrv_remove.

Applied, thanks.

Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center