X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=drivers%2Fchar%2Fdrm%2Fmga_drv.c;h=9f7ed0e0351b0c39cab6751c97df2b5694b5a872;hb=97f2aab6698f3ab2552c41c1024a65ffd0763a6d;hp=93f171e634c06c123f29e9ad1b2b55c4700b23a3;hpb=7ccf800e9415daf9214eb667318e356f9a3d81fc;p=safe%2Fjmp%2Flinux-2.6

diff --git a/drivers/char/drm/mga_drv.c b/drivers/char/drm/mga_drv.c
index 93f171e..9f7ed0e 100644
--- a/drivers/char/drm/mga_drv.c
+++ b/drivers/char/drm/mga_drv.c
@@ -131,7 +131,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;