From 31626bc5791a45982bc330a5385d7ef6573ed4e6 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Mon, 6 Aug 2012 16:31:26 +1000 Subject: [PATCH] --- yaml --- r: 329645 b: refs/heads/master c: 43b1e9c9899ece92c1f68d45ae0d7b98d009f5d0 h: refs/heads/master i: 329643: d93f5d8de9a6fc817d34f40dea178e7ab2b7722c v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/core/subdev/device/base.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 76659738ad0c..ae82acb933ba 100644 --- 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 index 42faa65b34e8..cac67dc634b7 100644 --- 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; } }