drm: Avoid use-before-null-test on dev in drm_cleanup().
authorEric Anholt <eric@anholt.net>
Fri, 19 Dec 2008 23:07:11 +0000 (15:07 -0800)
committerDave Airlie <airlied@linux.ie>
Mon, 29 Dec 2008 07:47:27 +0000 (17:47 +1000)
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@linux.ie>
drivers/gpu/drm/drm_drv.c

index 373e3de..febb517 100644 (file)
@@ -294,8 +294,6 @@ EXPORT_SYMBOL(drm_init);
  */
 static void drm_cleanup(struct drm_device * dev)
 {
-       struct drm_driver *driver = dev->driver;
-
        DRM_DEBUG("\n");
 
        if (!dev) {
@@ -330,7 +328,7 @@ static void drm_cleanup(struct drm_device * dev)
        if (drm_core_check_feature(dev, DRIVER_MODESET))
                drm_put_minor(&dev->control);
 
-       if (driver->driver_features & DRIVER_GEM)
+       if (dev->driver->driver_features & DRIVER_GEM)
                drm_gem_destroy(dev);
 
        drm_put_minor(&dev->primary);