From mboxrd@z Thu Jan 1 00:00:00 1970 From: Haojian Zhuang Date: Sat, 14 Dec 2013 07:27:09 +0000 Subject: Re: [patch 1/2] video: mmp: delete a stray mutex_unlock() Message-Id: <52AC084D.9070307@gmail.com> List-Id: References: <20131114081918.GB8150@elgon.mountain> In-Reply-To: <20131114081918.GB8150@elgon.mountain> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-fbdev@vger.kernel.org On 12/13/2013 09:11 PM, Dan Carpenter wrote: > Ping. > > regards, > dan carpenter > > On Thu, Nov 14, 2013 at 11:19:18AM +0300, Dan Carpenter wrote: >> We aren't holding the disp_lock so we shouldn't release it. >> >> Signed-off-by: Dan Carpenter >> >> diff --git a/drivers/video/mmp/core.c b/drivers/video/mmp/core.c >> index 84de263..c8d4265 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); >> >> -- >> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html Acked-by: Haojian Zhuang Jean, Could you help to merge this fix? Regards Haojian