Commit b95d58ea authored Jan 30, 2008 by Tejun Heo Committed by Jeff Garzik Feb 01, 2008

pci: allow multiple calls to pcim_enable_device()



There's no reason not to allow multiple calls to pcim_enable_device().
Calls after the first one can simply be noop.  All PCI resources will
be released when the initial pcim_enable_device() resource is
released.

This allows more flexibility to managed PCI users.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

parent 9f24e82d

drivers/pci/pci.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -823,7 +823,8 @@ int pcim_enable_device(struct pci_dev *pdev)
	dr = get_pci_dr(pdev);		dr = get_pci_dr(pdev);
	if (unlikely(!dr))		if (unlikely(!dr))
	return -ENOMEM;		return -ENOMEM;
	WARN_ON(!!dr->enabled);		if (dr->enabled)
			return 0;

	rc = pci_enable_device(pdev);		rc = pci_enable_device(pdev);
	if (!rc) {		if (!rc) {

Admin message