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

Commit 95ddc5f2 authored by Inaky Perez-Gonzalez's avatar Inaky Perez-Gonzalez Committed by Greg Kroah-Hartman
Browse files

PCI: pci_{enable,disable}_device() nestable ports 



Change drivers/message/i20 pci driver to simply do a nestable
enable()/disable() instead of checking for it.

Signed-off-by: default avatarInaky Perez-Gonzalez <inaky@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent bae94d02

drivers/message/i2o/pci.c

+6 −9
Original line number Diff line number Diff line
@@ -320,7 +320,6 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev, 
	struct i2o_controller *c;

	int rc;

	struct pci_dev *i960 = NULL;

	int enabled = pdev->is_enabled;



	printk(KERN_INFO "i2o: Checking for PCI I2O controllers...\n");
@@ -330,7 +329,6 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev, 
		return -ENODEV;

	}



	if (!enabled)

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

		printk(KERN_WARNING "i2o: couldn't enable device %s\n",

		       pci_name(pdev));
@@ -442,7 +440,6 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev, 
	i2o_iop_free(c);



      disable:

	if (!enabled)

	pci_disable_device(pdev);



	return rc;