PATCH: 2.6.10 - generic IDE return codes and a wrong ifdef

From: Alan Cox
Date: Tue Dec 28 2004 - 18:49:45 EST


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@xxxxxxxxxx>

--- ../linux.vanilla-2.6.10/drivers/ide/pci/generic.c 2004-12-25 21:15:34.000000000 +0000
+++ drivers/ide/pci/generic.c 2004-12-28 23:40:35.664503856 +0000
@@ -100,18 +100,18 @@
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@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/