From: Ben Skeggs <bskeggs@redhat.com>
Date: Wed, 3 Dec 2014 06:16:52 +0000 (+1000)
Subject: drm/nouveau/bios: fix oops on pre-nv50 chipsets
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c7e873f85fb60b1af589ac1b0c62353cfe0bbb29;p=linux-beck.git

drm/nouveau/bios: fix oops on pre-nv50 chipsets

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/core/subdev/bios/shadowramin.c b/drivers/gpu/drm/nouveau/core/subdev/bios/shadowramin.c
index 5e58bba0dd5c..a7a890fad1e5 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/bios/shadowramin.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/bios/shadowramin.c
@@ -44,8 +44,10 @@ static void
 pramin_fini(void *data)
 {
 	struct priv *priv = data;
-	nv_wr32(priv->bios, 0x001700, priv->bar0);
-	kfree(priv);
+	if (priv) {
+		nv_wr32(priv->bios, 0x001700, priv->bar0);
+		kfree(priv);
+	}
 }
 
 static void *