---

yaml --- r: 329645 b: refs/heads/master c: 43b1e9c h: refs/heads/master i: 329643: d93f5d8 v: v3
git-mirror · Oct 3, 2012 · 31626bc · 31626bc
1 parent dfc78f9
commit 31626bc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4837d27945b9b607b5a7274a33059e73d1a7831
+refs/heads/master: 43b1e9c9899ece92c1f68d45ae0d7b98d009f5d0
diff --git a/trunk/drivers/gpu/drm/nouveau/core/subdev/device/base.c b/trunk/drivers/gpu/drm/nouveau/core/subdev/device/base.c
@@ -139,8 +139,8 @@ nouveau_devobj_ctor(struct nouveau_object *parent,
 	if (!(args->disable & NV_DEVICE_DISABLE_IDENTIFY) &&
 	    !device->card_type) {
 		map = ioremap(mmio_base, 0x102000);
-		if (map == NULL) {
-		}
+		if (map == NULL)
+			return -ENOMEM;
 
 		/* switch mmio to cpu's native endianness */
 #ifndef __BIG_ENDIAN
@@ -230,7 +230,7 @@ nouveau_devobj_ctor(struct nouveau_object *parent,
 		nv_subdev(device)->mmio  = ioremap(mmio_base, mmio_size);
 		if (!nv_subdev(device)->mmio) {
 			nv_error(device, "unable to map device registers\n");
-			return ret;
+			return -ENOMEM;
 		}
 	}