summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2013-11-14 09:19:18 +0100
committerTomi Valkeinen <tomi.valkeinen@ti.com>2014-01-17 09:57:47 +0100
commit4ac8bd618b6c70fbc043c82f95d2d9b529c57109 (patch)
tree2884e16ab3e5a66e37a7bf2cfc048e6f3ea52767 /drivers/video
parentvideo: amba-clcd: Make CLCD driver available on more platforms (diff)
downloadlinux-4ac8bd618b6c70fbc043c82f95d2d9b529c57109.tar.xz
linux-4ac8bd618b6c70fbc043c82f95d2d9b529c57109.zip
video: mmp: delete a stray mutex_unlock()
We aren't holding the disp_lock so we shouldn't release it. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/mmp/core.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/video/mmp/core.c b/drivers/video/mmp/core.c
index 84de2632857a..c8d426541612 100644
--- a/drivers/video/mmp/core.c
+++ b/drivers/video/mmp/core.c
@@ -173,7 +173,7 @@ struct mmp_path *mmp_register_path(struct mmp_path_info *info)
+ sizeof(struct mmp_overlay) * info->overlay_num;
path = kzalloc(size, GFP_KERNEL);
if (!path)
- goto failed;
+ return NULL;
/* path set */
mutex_init(&path->access_ok);
@@ -219,11 +219,6 @@ struct mmp_path *mmp_register_path(struct mmp_path_info *info)
mutex_unlock(&disp_lock);
return path;
-
-failed:
- kfree(path);
- mutex_unlock(&disp_lock);
- return NULL;
}
EXPORT_SYMBOL_GPL(mmp_register_path);