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

Commit 708e5f9e authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

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



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

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 338b9bb3

drivers/ide/setup-pci.c

+10 −14
Original line number Original line Diff line number Diff line
@@ -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);