]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Fix non-terminated PCI match table in PowerMac IDE
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Sat, 6 Oct 2007 08:52:27 +0000 (18:52 +1000)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 6 Oct 2007 16:32:56 +0000 (09:32 -0700)
The PCI device table in the powermac IDE driver isn't properly
terminated.  Depending on how your kernel is linked and other random
factors, you can end up with this driver matched against any other PCI
device in your system, possibly crashing at boot.

Thanks to Heikki for tracking this down with me, the bug have been there
for some time, though it rarely hurts due to luck.  In this case, the
switch from .22 to .23-rc9 is causing it to show up due to differences
in the resulting layout of .data I suppose.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <pmac@au1.ibm.com>
Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl>
Cc: Heikki Lindholm <holindho@cs.helsinki.fi>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/ide/ppc/pmac.c

index f19eb6daeefd19e805376d1c7f86cde815b75d14..2fb047b898aa7d94279fa326327131b7b26d5bfe 100644 (file)
@@ -1546,6 +1546,7 @@ static struct pci_device_id pmac_ide_pci_match[] = {
          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_IPID2_ATA,
          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+       {},
 };
 
 static struct pci_driver pmac_ide_pci_driver = {