Fix non-terminated PCI match table in PowerMac IDE

71e4eda8 · Benjamin Herrenschmidt <[email protected]> · 2007-10-06 18:52:27 +10:00

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 <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Bartlomiej Zolnierkiewicz <[email protected]>
Cc: Heikki Lindholm <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

Commit: 71e4eda8ce698178ee448ff82bdc5803c77a736d
Parents: 67dd5a25

Changes

1 files changed · +1 −0

File	Status	Add	Del	Content
drivers/ide/ppc/pmac.c	modified	+1	−0	View file

drivers/ide/ppc/pmac.c

View file

diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index f19eb6d..2fb047b 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -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 = {