Messages in this thread Patch in this message | | | Date | Thu, 30 Dec 2004 01:07:52 +0100 | From | Francois Romieu <> | Subject | [patch 2.6.10-bk1 4/5] pci-ide: fix the incorrect returns for the generic driver |
| |
This patch updates ide/pci/generic.c to fix the incorrect returns causing PCI devices to be left reserved wrongly by the driver. It doesn't contain the other -ac improvements for pci/generic just these fixes.
Signed-off-by: Alan Cox <alan@redhat.com>
diff -puN drivers/ide/pci/generic.c~ata-035 drivers/ide/pci/generic.c --- linux-2.6.10-bk1/drivers/ide/pci/generic.c~ata-035 2004-12-29 23:58:27.261699983 +0100 +++ linux-2.6.10-bk1-romieu/drivers/ide/pci/generic.c 2004-12-29 23:58:27.264699493 +0100 @@ -100,18 +100,18 @@ static int __devinit generic_init_one(st if (dev->vendor == PCI_VENDOR_ID_UMC && dev->device == PCI_DEVICE_ID_UMC_UM8886A && (!(PCI_FUNC(dev->devfn) & 1))) - return 1; /* UM8886A/BF pair */ + return -ENODEV; /* UM8886A/BF pair */ if (dev->vendor == PCI_VENDOR_ID_OPTI && dev->device == PCI_DEVICE_ID_OPTI_82C558 && (!(PCI_FUNC(dev->devfn) & 1))) - return 1; + return -EAGAIN; pci_read_config_word(dev, PCI_COMMAND, &command); if(!(command & PCI_COMMAND_IO)) { printk(KERN_INFO "Skipping disabled %s IDE controller.\n", d->name); - return 1; + return -EAGAIN; } ide_setup_pci_device(dev, d); return 0; _ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |