nouveau: Fix dereferencing a NULL pointer when erroring out during initialization.

diff --git a/shared-core/nouveau_state.c b/shared-core/nouveau_state.c
index cba12b5..cb19c88 100644 (file)
--- a/shared-core/nouveau_state.c
+++ b/shared-core/nouveau_state.c
@@ -423,12 +423,15 @@ void nouveau_lastclose(struct drm_device *dev)
 {
        struct drm_nouveau_private *dev_priv = dev->dev_private;
 
-       nouveau_card_takedown(dev);
-
-       if(dev_priv->fb_mtrr>0)
-       {
-               drm_mtrr_del(dev_priv->fb_mtrr, drm_get_resource_start(dev, 1),nouveau_mem_fb_amount(dev), DRM_MTRR_WC);
-               dev_priv->fb_mtrr=0;
+       /* In the case of an error dev_priv may not be be allocated yet */
+       if (dev_priv && dev_priv->card_type) {
+               nouveau_card_takedown(dev);
+
+               if(dev_priv->fb_mtrr>0)
+               {
+                       drm_mtrr_del(dev_priv->fb_mtrr, drm_get_resource_start(dev, 1),nouveau_mem_fb_amount(dev), DRM_MTRR_WC);
+                       dev_priv->fb_mtrr=0;
+               }
        }
 }