commit bd07ed2b4d7071716c09895e19849e8b04991656
author Dave Airlie <airlied@starflyer.(none)> Wed Nov 23 21:45:43 2005 +1100
committer Dave Airlie <airlied@linux.ie> Wed Nov 23 21:45:43 2005 +1100
tree 41aebda6814e358c6afc27b1f00dbe21355e5eaa
parent 1778d55edb62753a92b979fa57072c2e1ff3d062

I think that if a PCI bus is a root bus, attached to a host bridge not a
PCI->PCI bridge, then bus->self is allowed to be NULL. Certainly that's
the case on my Pegasos, and it makes the MGA DRM driver oops...

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Dave Airlie <airlied@linux.ie>

drivers/char/drm/mga_drv.c

diff --git a/drivers/char/drm/mga_drv.c b/drivers/char/drm/mga_drv.c
index 0cc7c30..1713451 100644
--- a/drivers/char/drm/mga_drv.c
+++ b/drivers/char/drm/mga_drv.c
@@ -161,7 +161,7 @@
 	 * device.
 	 */
 
-	if ((pdev->device == 0x0525)
+	if ((pdev->device == 0x0525) && pdev->bus->self
 	    && (pdev->bus->self->vendor == 0x3388)
 	    && (pdev->bus->self->device == 0x0021)) {
 		return 0;