Subject: [merged] video-mmp-delete-a-stray-mutex_unlock.patch removed from -mm tree
To: dan.carpenter@xxxxxxxxxx,cldu@xxxxxxxxxxx,epure.andrei@xxxxxxxxx,haojian.zhuang@xxxxxxxxx,plagnioj@xxxxxxxxxxxx,tomi.valkeinen@xxxxxx,zzhu3@xxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Mon, 13 Jan 2014 13:21:48 -0800
The patch titled
Subject: drivers/video/mmp/core.c: delete a stray mutex_unlock()
has been removed from the -mm tree. Its filename was
video-mmp-delete-a-stray-mutex_unlock.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Subject: drivers/video/mmp/core.c: 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@xxxxxxxxxx>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@xxxxxxxxxxxx>
Cc: Tomi Valkeinen <tomi.valkeinen@xxxxxx>
Acked-by: Haojian Zhuang <haojian.zhuang@xxxxxxxxx>
Cc: Andrei Epure <epure.andrei@xxxxxxxxx>
Cc: Lisa Du <cldu@xxxxxxxxxxx>
Cc: Zhou Zhu <zzhu3@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/video/mmp/core.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff -puN drivers/video/mmp/core.c~video-mmp-delete-a-stray-mutex_unlock drivers/video/mmp/core.c
--- a/drivers/video/mmp/core.c~video-mmp-delete-a-stray-mutex_unlock
+++ a/drivers/video/mmp/core.c
@@ -173,7 +173,7 @@ struct mmp_path *mmp_register_path(struc
+ 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(struc
mutex_unlock(&disp_lock);
return path;
-
-failed:
- kfree(path);
- mutex_unlock(&disp_lock);
- return NULL;
}
EXPORT_SYMBOL_GPL(mmp_register_path);
_
Patches currently in -mm which might be from dan.carpenter@xxxxxxxxxx are
ocfs2-use-the-new-dlm-operation-callbacks-while-requesting-new-lockspace.patch
ocfs2-use-the-new-dlm-operation-callbacks-while-requesting-new-lockspace-fix.patch
drivers-scsi-megaraid-megaraid_mmc-missing-bounds-check-in-mimd_to_kioc.patch
drivers-block-paride-pgc-underflow-bug-in-pg_write.patch
fs-compat_ioctlc-fix-an-underflow-issue-harmless.patch
drivers-mailbox-omap-make-mbox-irq-signed-for-error-handling.patch
checkpatch-warn-only-on-space-before-semicolon-at-end-of-line.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
