diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-11-23 11:45:43 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-11-23 11:45:43 +0100 |
| commit | bd07ed2b4d7071716c09895e19849e8b04991656 (patch) | |
| tree | 41aebda6814e358c6afc27b1f00dbe21355e5eaa /drivers | |
| parent | compat-ioctl.c: fix compile with no CONFIG_JBD (diff) | |
| download | linux-bd07ed2b4d7071716c09895e19849e8b04991656.tar.xz linux-bd07ed2b4d7071716c09895e19849e8b04991656.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/drm/mga_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/drm/mga_drv.c b/drivers/char/drm/mga_drv.c index 0cc7c305a7f6..1713451a5cc6 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; |