From: Alexandre Courbot <acourbot@nvidia.com>
Date: Mon, 26 Oct 2015 05:55:37 +0000 (+0900)
Subject: drm/nouveau/core: fix return in error path of device probe
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=1299b6377b099bc4348d955930ebe1f0ee5ccc46;p=openwrt%2Fstaging%2Fblogic.git

drm/nouveau/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>
---

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
index bbc9824af6e0..7476ac271573 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+++ b/drivers/gpu/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;
 		}
 	}