Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd07ed2b authored by Dave Airlie's avatar Dave Airlie Committed by Dave Airlie
Browse files

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: default avatarDavid Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 1778d55e
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -161,7 +161,7 @@ static int mga_driver_device_is_agp(drm_device_t * dev)
	 * device.
	 * device.
	 */
	 */


	if ((pdev->device == 0x0525)
	if ((pdev->device == 0x0525) && pdev->bus->self
	    && (pdev->bus->self->vendor == 0x3388)
	    && (pdev->bus->self->vendor == 0x3388)
	    && (pdev->bus->self->device == 0x0021)) {
	    && (pdev->bus->self->device == 0x0021)) {
		return 0;
		return 0;