Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03e49d40 authored by Scott Murray's avatar Scott Murray Committed by Greg Kroah-Hartman
Browse files

[PATCH] PCI Hotplug: fix CPCI reference counting bug 



Here's a patch that fixes up the pci_dev refcounting in the CPCI code.
I've done some testing against it and it seems fine here.

Signed-off-by: default avatarScott Murray <scottm@somanetworks.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5273a00d

drivers/pci/hotplug/cpci_hotplug_core.c

+2 −0
Original line number Diff line number Diff line
@@ -217,6 +217,8 @@ static void release_slot(struct hotplug_slot *hotplug_slot) 
	kfree(slot->hotplug_slot->info);

	kfree(slot->hotplug_slot->name);

	kfree(slot->hotplug_slot);

	if (slot->dev)

		pci_dev_put(slot->dev);

	kfree(slot);

}

drivers/pci/hotplug/cpci_hotplug_pci.c

+4 −1
Original line number Diff line number Diff line
@@ -315,9 +315,12 @@ int cpci_unconfigure_slot(struct slot* slot) 
				    PCI_DEVFN(PCI_SLOT(slot->devfn), i));

		if (dev) {

			pci_remove_bus_device(dev);

			slot->dev = NULL;

			pci_dev_put(dev);

		}

	}

	pci_dev_put(slot->dev);

	slot->dev = NULL;



	dbg("%s - exit", __FUNCTION__);

	return 0;

}