drm/nouveau/device: return proper error codes if ioremap fails

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

diff --git a/drivers/gpu/drm/nouveau/core/subdev/device/base.c b/drivers/gpu/drm/nouveau/core/subdev/device/base.c
index 42faa65b34e85cb042061e77ae96d253426fcad0..cac67dc634b7d5a49df9eeb9dda3f0edb8e032b1 100644 (file)
--- 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,
        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;
                }
        }