summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Courbot <acourbot@nvidia.com>2015-10-23 12:41:25 +0900
committerAlexandre Courbot <acourbot@nvidia.com>2015-10-26 14:55:11 +0900
commit46a3e1f66e63ca5150e6e5b3fd5f602d14b0a0da (patch)
tree2cf1679d533df85e3b9ce151351b0b5e7c704898
parent9d21a02ba7597c077a43b7b778bbf8918830adf6 (diff)
downloadnouveau-46a3e1f66e63ca5150e6e5b3fd5f602d14b0a0da.tar.gz
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>
-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 bbc9824af..7476ac271 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;
}
}