Commit a1e022b3 authored Apr 28, 2006 by Kristen Accardi Committed by Greg Kroah-Hartman Jun 21, 2006

[PATCH] PCI: don't enable device if already enabled



If a device is already enabled, don't bother reenabling it.

Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Acked-By: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

parent 9f125d30

drivers/pci/pci.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -517,7 +517,12 @@ pci_enable_device_bars(struct pci_dev *dev, int bars)
		int
		pci_enable_device(struct pci_dev *dev)
		{
		int err = pci_enable_device_bars(dev, (1 << PCI_NUM_RESOURCES) - 1);
		int err;

		if (dev->is_enabled)
		return 0;

		err = pci_enable_device_bars(dev, (1 << PCI_NUM_RESOURCES) - 1);
		if (err)
		return err;
		pci_fixup_device(pci_fixup_enable, dev);