From patchwork Thu Nov 7 12:44:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 20694 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1VeOx8-0006xg-PB; Thu, 07 Nov 2013 13:44:50 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-7) with esmtp id 1VeOx4-0004hM-12; Thu, 07 Nov 2013 13:44:49 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750996Ab3KGMoo (ORCPT + 1 other); Thu, 7 Nov 2013 07:44:44 -0500 Received: from mail-bk0-f51.google.com ([209.85.214.51]:47598 "EHLO mail-bk0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750948Ab3KGMon (ORCPT ); Thu, 7 Nov 2013 07:44:43 -0500 Received: by mail-bk0-f51.google.com with SMTP id my12so207146bkb.24 for ; Thu, 07 Nov 2013 04:44:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=6/F3YurSaYZaq5ZIXYmP9JPQv1jkQ8AGcrYiZCZMwJY=; b=jwqMr3Ln18yz736qN1QjpUUMoNc4ExD8QwUAp57VNOj/RtkhNs+RRuBeJ68lna/MM5 GLMEgDnnnZ7Yto0/xatH2j7Q56aOU8i9f3i94a3fDOH2eS7bBmAoc7ZQoXjpaF5XL3wn mpRFToyijULD+otcHeWO++5pfVcXLttNRQEpa6SzubSdbptqzjhT/9i/nL3UmhaZWO8W 4pbTbJw9w0FTP4vXBhbw8BjOKPow6O0fBlP7bCw38i5jSMkZHK+nYtaWFQ5ZwqYlKO0Z FrM9V8mvIAKiQbGXJSHxZUaiUIaR72m+pBGh+i68kSM79leq0Oekp22gABl077AMV8gp msew== MIME-Version: 1.0 X-Received: by 10.204.197.207 with SMTP id el15mr236987bkb.72.1383828282132; Thu, 07 Nov 2013 04:44:42 -0800 (PST) Received: by 10.205.19.10 with HTTP; Thu, 7 Nov 2013 04:44:42 -0800 (PST) Date: Thu, 7 Nov 2013 20:44:42 +0800 Message-ID: Subject: [PATCH -next] [media] media: i2c: lm3560: fix missing unlock on error in lm3560_set_ctrl() From: Wei Yongjun To: m.chehab@samsung.com, gshark.jeong@gmail.com Cc: yongjun_wei@trendmicro.com.cn, linux-media@vger.kernel.org Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2013.11.7.122714 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' CN_TLD 0.1, FORGED_FROM_GMAIL 0.1, MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1500_1599 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, WEBMAIL_SOURCE 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __CT 0, __CT_TEXT_PLAIN 0, __DATE_TZ_HK 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_HTTP_RECEIVED 0, __PHISH_SPEAR_STRUCTURE_1 0, __PHISH_SPEAR_STRUCTURE_2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' From: Wei Yongjun Add the missing unlock before return from function lm3560_set_ctrl() in the error handling case. Signed-off-by: Wei Yongjun --- drivers/media/i2c/lm3560.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/i2c/lm3560.c b/drivers/media/i2c/lm3560.c index 3317a9a..33a6d2a 100644 --- a/drivers/media/i2c/lm3560.c +++ b/drivers/media/i2c/lm3560.c @@ -219,15 +219,19 @@ static int lm3560_set_ctrl(struct v4l2_ctrl *ctrl, enum lm3560_led_id led_no) break; case V4L2_CID_FLASH_STROBE: - if (flash->led_mode != V4L2_FLASH_LED_MODE_FLASH) - return -EBUSY; + if (flash->led_mode != V4L2_FLASH_LED_MODE_FLASH) { + rval = -EBUSY; + goto err_out; + } flash->led_mode = V4L2_FLASH_LED_MODE_FLASH; rval = lm3560_mode_ctrl(flash); break; case V4L2_CID_FLASH_STROBE_STOP: - if (flash->led_mode != V4L2_FLASH_LED_MODE_FLASH) - return -EBUSY; + if (flash->led_mode != V4L2_FLASH_LED_MODE_FLASH) { + rval = -EBUSY; + goto err_out; + } flash->led_mode = V4L2_FLASH_LED_MODE_NONE; rval = lm3560_mode_ctrl(flash); break; @@ -247,8 +251,8 @@ static int lm3560_set_ctrl(struct v4l2_ctrl *ctrl, enum lm3560_led_id led_no) break; } - mutex_unlock(&flash->lock); err_out: + mutex_unlock(&flash->lock); return rval; }