summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Courbot <acourbot@nvidia.com>2015-10-26 14:55:37 +0900
committerBen Skeggs <bskeggs@redhat.com>2015-11-25 15:38:13 +1000
commit071cf4b2bd0c54f23b39dd20bcf3bbcd3f5da0b2 (patch)
tree1d9d0269daee3d8ec1367c5c72639452864fd3a4
parent9a5157e12f64e582de6dd46a0f6908c1dd2a3dba (diff)
core: fix return in error path of device probe
We want to unlock nv_devices_mutex in this error path as well. Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drm/nouveau/nvkm/engine/device/base.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drm/nouveau/nvkm/engine/device/base.c b/drm/nouveau/nvkm/engine/device/base.c
index bbc9824a..7476ac27 100644
--- a/drm/nouveau/nvkm/engine/device/base.c
+++ b/drm/nouveau/nvkm/engine/device/base.c
@@ -2494,7 +2494,8 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
device->pri = ioremap(mmio_base, mmio_size);
if (!device->pri) {
nvdev_error(device, "unable to map PRI\n");
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto done;
}
}