evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2012-08-06 16:31:26 +10:00
parent c4837d2794
commit 43b1e9c989
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/gpu/drm/nouveau/core/subdev/device/base.c
View file

@ -139,8 +139,8 @@ nouveau_devobj_ctor(struct nouveau_object *parent,
if (!(args->disable & NV_DEVICE_DISABLE_IDENTIFY) && if (!(args->disable & NV_DEVICE_DISABLE_IDENTIFY) &&
!device->card_type) { !device->card_type) {
map = ioremap(mmio_base, 0x102000); map = ioremap(mmio_base, 0x102000);
if (map == NULL) { if (map == NULL)
} return -ENOMEM;
/* switch mmio to cpu's native endianness */ /* switch mmio to cpu's native endianness */
#ifndef __BIG_ENDIAN #ifndef __BIG_ENDIAN
@ -230,7 +230,7 @@ nouveau_devobj_ctor(struct nouveau_object *parent,
nv_subdev(device)->mmio = ioremap(mmio_base, mmio_size); nv_subdev(device)->mmio = ioremap(mmio_base, mmio_size);
if (!nv_subdev(device)->mmio) { if (!nv_subdev(device)->mmio) {
nv_error(device, "unable to map device registers\n"); nv_error(device, "unable to map device registers\n");
return ret; return -ENOMEM;
} }
} }