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

Commit cf6e854e authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: fix disabled ports reporting for PCI controllers 



Report all disabled ports in ide_pci_setup_ports() (prevents the bogus
warning when ide_hwif_configure()->ide_match_hwif() fails to find free
ide_hwifs[] slots).

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

drivers/ide/setup-pci.c

+4 −6
Original line number Diff line number Diff line
@@ -526,7 +526,6 @@ static int ide_setup_pci_controller(struct pci_dev *dev, ide_pci_device_t *d, in 
void ide_pci_setup_ports(struct pci_dev *dev, ide_pci_device_t *d, int pciirq, ata_index_t *index)

{

	int channels = (d->host_flags & IDE_HFLAG_SINGLE) ? 1 : 2, port;

	int at_least_one_hwif_enabled = 0;

	ide_hwif_t *hwif, *mate = NULL;

	u8 tmp;
@@ -540,8 +539,10 @@ void ide_pci_setup_ports(struct pci_dev *dev, ide_pci_device_t *d, int pciirq, a 
		ide_pci_enablebit_t *e = &(d->enablebits[port]);

	

		if (e->reg && (pci_read_config_byte(dev, e->reg, &tmp) ||

		    (tmp & e->mask) != e->val))

		    (tmp & e->mask) != e->val)) {

			printk(KERN_INFO "%s: IDE port disabled\n", d->name);

			continue;	/* port not enabled */

		}



		if ((hwif = ide_hwif_configure(dev, d, mate, port, pciirq)) == NULL)

			continue;
@@ -587,10 +588,7 @@ void ide_pci_setup_ports(struct pci_dev *dev, ide_pci_device_t *d, int pciirq, a 
			d->init_hwif(hwif);



		mate = hwif;

		at_least_one_hwif_enabled = 1;

	}

	if (!at_least_one_hwif_enabled)

		printk(KERN_INFO "%s: neither IDE port enabled (BIOS)\n", d->name);

}



EXPORT_SYMBOL_GPL(ide_pci_setup_ports);