From: Dave Airlie Date: Wed, 23 Nov 2005 10:45:43 +0000 (+1100) Subject: I think that if a PCI bus is a root bus, attached to a host bridge not a X-Git-Tag: v2.6.15-rc4~20^2~2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=bd07ed2b4d7071716c09895e19849e8b04991656;p=linux-2.6-omap-h63xx.git 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 Signed-off-by: Dave Airlie --- diff --git a/drivers/char/drm/mga_drv.c b/drivers/char/drm/mga_drv.c index 0cc7c305a7f..1713451a5cc 100644 --- a/drivers/char/drm/mga_drv.c +++ b/drivers/char/drm/mga_drv.c @@ -161,7 +161,7 @@ static int mga_driver_device_is_agp(drm_device_t * dev) * device. */ - if ((pdev->device == 0x0525) + if ((pdev->device == 0x0525) && pdev->bus->self && (pdev->bus->self->vendor == 0x3388) && (pdev->bus->self->device == 0x0021)) { return 0;