Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754617AbcKJJzM (ORCPT ); Thu, 10 Nov 2016 04:55:12 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:60237 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752760AbcKJJzK (ORCPT ); Thu, 10 Nov 2016 04:55:10 -0500 X-AuditID: cbfee61a-f79916d0000062de-0f-582443f4a987 From: Shailendra Verma To: Jarod Wilson , Mauro Carvalho Chehab , Greg Kroah-Hartman , linux-media@vger.kernel.org, devel@driverdev.osuosl.org, Shailendra Verma , Shailendra Verma Cc: linux-kernel@vger.kernel.org, vidushi.koul@samsung.com Subject: [PATCH 2/2] Staging: Media: Lirc - Improvement in code readability Date: Thu, 10 Nov 2016 15:22:38 +0530 Message-id: <1478771558-1314-1-git-send-email-shailendra.v@samsung.com> X-Mailer: git-send-email 1.7.9.5 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrOLMWRmVeSWpSXmKPExsVy+t9jQd0vzioRBscOy1nsOfOL3aJ58Xo2 i6svTjBZXN41h82iZ8NWVovVzyosbs2byWax6NsrZou/Fy+xOXB63Nt3mMVj56y77B77565h 99jSD2T1bVnF6PF5k5zH1JN9rAHsUW42GamJKalFCql5yfkpmXnptkqhIW66FkoKeYm5qbZK Ebq+IUFKCmWJOaVAnpEBGnBwDnAPVtK3S3DLuHXwGWvBfp6Kx39XsDYwHufqYuTkkBAwkWi/ 3cUCYYtJXLi3nq2LkYtDSGAWo8SuWT+gnJ+MEmuXrmEHqWITMJR43feXCSQhIrCCSWLOwlaw BLOAlcSk/7NZuxg5OIQFvCWmnbQECbMIqEp8vNrHBmLzCrhLtH7ZxQJSIiGgIDFnks0ERu4F jAyrGCVSC5ILipPScw3zUsv1ihNzi0vz0vWS83M3MYID+ZnUDsaDu9wPMQpwMCrx8HZoKkcI sSaWFVfmHmKU4GBWEuFVdVSJEOJNSaysSi3Kjy8qzUktPsRoCrR/IrOUaHI+MMrySuINTcxN zI0NLMwtLU2MlMR5G2c/CxcSSE8sSc1OTS1ILYLpY+LglGpgTJzesXDt9Sk3RT0Erh64lBnO 16HDwBg/+dkGfYcOm2/79Hq3VW5++G3O+Upb7+PvDza/0z/a3hmyxP9wjYvut54zl0WPLOi4 Ju/504rt5Fz7j0Kyk62K1IRyGNM/en6o+H7v3tXJ/Sau07gnWNcdPm7c4530OO+Z5nLp7Vr5 XHG/VR9pGt7pVmIpzkg01GIuKk4EABr6cdp6AgAA X-MTR: 20000000000000000@CPGS Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1552 Lines: 45 From: "Shailendra Verma" There is no need to call kfree() if memdup_user() fails, as no memory was allocated and the error in the error-valued pointer should be returned. Signed-off-by: Shailendra Verma --- drivers/staging/media/lirc/lirc_imon.c | 5 ++--- drivers/staging/media/lirc/lirc_sasem.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/staging/media/lirc/lirc_imon.c b/drivers/staging/media/lirc/lirc_imon.c index 198a805..610d38c 100644 --- a/drivers/staging/media/lirc/lirc_imon.c +++ b/drivers/staging/media/lirc/lirc_imon.c @@ -408,9 +408,8 @@ static ssize_t vfd_write(struct file *file, const char __user *buf, data_buf = memdup_user(buf, n_bytes); if (IS_ERR(data_buf)) { - retval = PTR_ERR(data_buf); - data_buf = NULL; - goto exit; + mutex_unlock(&context->ctx_lock); + return PTR_ERR(data_buf); } memcpy(context->tx.data_buf, data_buf, n_bytes); diff --git a/drivers/staging/media/lirc/lirc_sasem.c b/drivers/staging/media/lirc/lirc_sasem.c index 4678ae1..4fd810b 100644 --- a/drivers/staging/media/lirc/lirc_sasem.c +++ b/drivers/staging/media/lirc/lirc_sasem.c @@ -384,9 +384,8 @@ static ssize_t vfd_write(struct file *file, const char __user *buf, data_buf = memdup_user(buf, n_bytes); if (IS_ERR(data_buf)) { - retval = PTR_ERR(data_buf); - data_buf = NULL; - goto exit; + mutex_unlock(&context->ctx_lock); + return PTR_ERR(data_buf); } memcpy(context->tx.data_buf, data_buf, n_bytes); -- 1.7.9.5