patch-2.4.27 linux-2.4.27/arch/alpha/kernel/sys_takara.c

• Lines: 14
• Date: 2004-08-07 16:26:04.544342258 -0700
• Orig file: linux-2.4.26/arch/alpha/kernel/sys_takara.c
• Orig date: 2000-10-27 10:55:01.000000000 -0700

diff -urN linux-2.4.26/arch/alpha/kernel/sys_takara.c linux-2.4.27/arch/alpha/kernel/sys_takara.c
@@ -230,8 +230,12 @@
 	int slot = PCI_SLOT(dev->devfn);
 	int pin = *pinp;
 	unsigned int ctlreg = inl(0x500);
-	unsigned int busslot = PCI_SLOT(dev->bus->self->devfn);
+	unsigned int busslot;
 
+	if (!dev->bus->self)
+		return slot;
+
+	busslot = PCI_SLOT(dev->bus->self->devfn);
 	/* Check for built-in bridges.  */
 	if (dev->bus->number != 0
 	    && busslot > 16