lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ide: always call ->init_chipset method in do_ide_setup_pci_device()

Browse Source 
Call ->init_chipset method also for 'tried_config' / '!pciirq' conditions.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz
2008-07-24 22:53:11 +02:00
parent 338b9bb3ad
commit 708e5f9eb6
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/ide/setup-pci.c
View File

@@ -499,11 +499,6 @@ static int do_ide_setup_pci_device(struct pci_dev *dev,
*/ */
pciirq = dev->irq; pciirq = dev->irq;
/* Is it an "IDE storage" device in non-PCI mode? */
if ((dev->class >> 8) == PCI_CLASS_STORAGE_IDE && (dev->class & 5) != 5) {
if (noisy)
printk(KERN_INFO "%s: not 100%% native mode: "
"will probe irqs later\n", d->name);
/* /*
* This allows offboard ide-pci cards the enable a BIOS, * This allows offboard ide-pci cards the enable a BIOS,
* verify interrupt settings of split-mirror pci-config * verify interrupt settings of split-mirror pci-config
@@ -513,6 +508,12 @@ static int do_ide_setup_pci_device(struct pci_dev *dev,
ret = d->init_chipset ? d->init_chipset(dev, d->name) : 0; ret = d->init_chipset ? d->init_chipset(dev, d->name) : 0;
if (ret < 0) if (ret < 0)
goto out; goto out;
/* Is it an "IDE storage" device in non-PCI mode? */
if ((dev->class >> 8) == PCI_CLASS_STORAGE_IDE && (dev->class & 5) != 5) {
if (noisy)
printk(KERN_INFO "%s: not 100%% native mode: "
"will probe irqs later\n", d->name);
pciirq = ret; pciirq = ret;
} else if (tried_config) { } else if (tried_config) {
if (noisy) if (noisy)
@@ -524,11 +525,6 @@ static int do_ide_setup_pci_device(struct pci_dev *dev,
d->name, pciirq); d->name, pciirq);
pciirq = 0; pciirq = 0;
} else { } else {
if (d->init_chipset) {
ret = d->init_chipset(dev, d->name);
if (ret < 0)
goto out;
}
if (noisy) if (noisy)
printk(KERN_INFO "%s: 100%% native mode on irq %d\n", printk(KERN_INFO "%s: 100%% native mode on irq %d\n",
d->name, pciirq); d->name, pciirq);