Pull bugzilla-5637 into release branch

e63501d5 · Len Brown · 88fb61e4 · 96c2a876 · e63501d5
Commit e63501d5 authored Jan 11, 2008 by Len Brown
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

drivers/acpi/pci_irq.c drivers/acpi/pci_irq.c +9 -0

No files found.
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -429,6 +429,15 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
 					  &polarity, &link,
 					  acpi_pci_allocate_irq);
+	if (irq < 0) {
+		/*
+		 * IDE legacy mode controller IRQs are magic. Why do compat
+		 * extensions always make such a nasty mess.
+		 */
+		if (dev->class >> 8 == PCI_CLASS_STORAGE_IDE &&
+				(dev->class & 0x05) == 0)
+			return 0;
+	}
 	/*
 	 * No IRQ known to the ACPI subsystem - maybe the BIOS / 
 	 * driver reported one, then use it. Exit in any case.