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

Commit 15d8ec7d authored by Markus Lidel's avatar Markus Lidel Committed by Linus Torvalds
Browse files

[PATCH] I2O: don't disable PCI device if it is enabled before probing 



If PCI device is enabled before probing, it will not be disabled at exit.

Signed-off-by: default avatarMarkus Lidel <Markus.Lidel@shadowconnect.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 35dc8161

drivers/message/i2o/pci.c

+14 −15
Original line number Diff line number Diff line
@@ -88,6 +88,11 @@ static int __devinit i2o_pci_alloc(struct i2o_controller *c) 
	struct device *dev = &pdev->dev;

	int i;



	if (pci_request_regions(pdev, OSM_DESCRIPTION)) {

		printk(KERN_ERR "%s: device already claimed\n", c->name);

		return -ENODEV;

	}



	for (i = 0; i < 6; i++) {

		/* Skip I/O spaces */

		if (!(pci_resource_flags(pdev, i) & IORESOURCE_IO)) {
@@ -298,7 +303,7 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev, 
	struct i2o_controller *c;

	int rc;

	struct pci_dev *i960 = NULL;

	int pci_dev_busy = 0;

	int enabled = pdev->is_enabled;



	printk(KERN_INFO "i2o: Checking for PCI I2O controllers...\n");
@@ -308,17 +313,13 @@ 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));

			return rc;

		}



	if (pci_request_regions(pdev, OSM_DESCRIPTION)) {

		printk(KERN_ERR "i2o: device already claimed\n");

		return -ENODEV;

	}



	if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {

		printk(KERN_WARNING "i2o: no suitable DMA found for %s\n",

		       pci_name(pdev));
@@ -396,8 +397,6 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev, 
	if ((rc = i2o_pci_alloc(c))) {

		printk(KERN_ERR "%s: DMA / IO allocation for I2O controller "

		       "failed\n", c->name);

		if (rc == -ENODEV)

			pci_dev_busy = 1;

		goto free_controller;

	}
@@ -425,7 +424,7 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev, 
	i2o_iop_free(c);



      disable:

	if (!pci_dev_busy)

	if (!enabled)

		pci_disable_device(pdev);



	return rc;