Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] i2o: Do not disable pci device when it's in use

Browse source 
When dpt_i2o is loaded first, i2o being loaded would cause it to call
pci_device_disable, thus breaking dpt_i2o's use of the device.  Based on
similar usage of pci_disable_device in other drivers.

Signed-off-by: Ben Collins <bcollins@ubuntu.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Ben Collins 2005-12-17 18:39:23 -08:00 committed by Linus Torvalds
parent 48ea753075
commit 87d47d0547
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/message/i2o/pci.c
View file

@ -303,6 +303,7 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev,
struct i2o_controller *c; struct i2o_controller *c;
int rc; int rc;
struct pci_dev *i960 = NULL; struct pci_dev *i960 = NULL;
int pci_dev_busy = 0;
printk(KERN_INFO "i2o: Checking for PCI I2O controllers...\n"); printk(KERN_INFO "i2o: Checking for PCI I2O controllers...\n");
@ -395,6 +396,8 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev,
if ((rc = i2o_pci_alloc(c))) { if ((rc = i2o_pci_alloc(c))) {
printk(KERN_ERR "%s: DMA / IO allocation for I2O controller " printk(KERN_ERR "%s: DMA / IO allocation for I2O controller "
" failed\n", c->name); " failed\n", c->name);
if (rc == -ENODEV)
pci_dev_busy = 1;
goto free_controller; goto free_controller;
} }
@ -425,7 +428,8 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev,
i2o_iop_free(c); i2o_iop_free(c);
disable: disable:
pci_disable_device(pdev); if (!pci_dev_busy)
pci_disable_device(pdev);
return rc; return rc;
} }