drm/i915: fix oops on agp=off
authorDave Airlie <airlied@linux.ie>
Sat, 29 Mar 2008 21:53:58 +0000 (07:53 +1000)
committerDave Airlie <airlied@linux.ie>
Sat, 29 Mar 2008 21:53:58 +0000 (07:53 +1000)
From Kernel BZ 10289 - not sure why anyone would boot an intel with no agp
but it shouldn't crash.

Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/char/drm/i915_dma.c

index e9d6663bec73ec5e9a2642d6af29bab81b0b9f40..a043bb12301acd9c1cf087663659c775316dd9f2 100644 (file)
@@ -804,6 +804,9 @@ void i915_driver_lastclose(struct drm_device * dev)
 {
        drm_i915_private_t *dev_priv = dev->dev_private;
 
 {
        drm_i915_private_t *dev_priv = dev->dev_private;
 
+       if (!dev_priv)
+               return;
+
        if (dev_priv->agp_heap)
                i915_mem_takedown(&(dev_priv->agp_heap));
 
        if (dev_priv->agp_heap)
                i915_mem_takedown(&(dev_priv->agp_heap));