aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2012-08-06 02:31:26 -0400
committerBen Skeggs <bskeggs@redhat.com>2012-10-02 23:13:01 -0400
commit43b1e9c9899ece92c1f68d45ae0d7b98d009f5d0 (patch)
treee3d2a36b555f1cc3893335df257eccb1bbce6f8f /drivers/gpu
parentc4837d27945b9b607b5a7274a33059e73d1a7831 (diff)
drm/nouveau/device: return proper error codes if ioremap fails
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/device/base.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/device/base.c b/drivers/gpu/drm/nouveau/core/subdev/device/base.c
index 42faa65b34e8..cac67dc634b7 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/device/base.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/device/base.c
@@ -139,8 +139,8 @@ nouveau_devobj_ctor(struct nouveau_object *parent,
139 if (!(args->disable & NV_DEVICE_DISABLE_IDENTIFY) && 139 if (!(args->disable & NV_DEVICE_DISABLE_IDENTIFY) &&
140 !device->card_type) { 140 !device->card_type) {
141 map = ioremap(mmio_base, 0x102000); 141 map = ioremap(mmio_base, 0x102000);
142 if (map == NULL) { 142 if (map == NULL)
143 } 143 return -ENOMEM;
144 144
145 /* switch mmio to cpu's native endianness */ 145 /* switch mmio to cpu's native endianness */
146#ifndef __BIG_ENDIAN 146#ifndef __BIG_ENDIAN
@@ -230,7 +230,7 @@ nouveau_devobj_ctor(struct nouveau_object *parent,
230 nv_subdev(device)->mmio = ioremap(mmio_base, mmio_size); 230 nv_subdev(device)->mmio = ioremap(mmio_base, mmio_size);
231 if (!nv_subdev(device)->mmio) { 231 if (!nv_subdev(device)->mmio) {
232 nv_error(device, "unable to map device registers\n"); 232 nv_error(device, "unable to map device registers\n");
233 return ret; 233 return -ENOMEM;
234 } 234 }
235 } 235 }
236 236