From patchwork Thu Nov 14 03:43:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Jeong X-Patchwork-Id: 20731 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1Vgnqu-0002rQ-3E; Thu, 14 Nov 2013 04:44:20 +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 1Vgnqs-0006LK-0p; Thu, 14 Nov 2013 04:44:19 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752783Ab3KNDoO (ORCPT + 1 other); Wed, 13 Nov 2013 22:44:14 -0500 Received: from mail-pa0-f49.google.com ([209.85.220.49]:63146 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751394Ab3KNDoN (ORCPT ); Wed, 13 Nov 2013 22:44:13 -0500 Received: by mail-pa0-f49.google.com with SMTP id lf10so1435665pab.8 for ; Wed, 13 Nov 2013 19:44:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=D7Oiecs+zxwSR9P3emzYhEn8VjPfCoSudo3PWfgCIHg=; b=rfQlc0PpEUeeM4dDcfEyk+6hZWgi/Dk05NfuzQ1bUezDTY6koIFeK8IZkhaHczzMwP R9TaF3ii0Tu8KlVnCuj6kh00x2VwLO0+cW74qm5+czfXlqc3NdSvy/6QLIKweBCIbv8U bAirQB3lo96fkxDOz9nzExAGQh2VrFrf8Sts5pdz/DEZfOuqWuESL2C99QK7GcUVXzyU XqaS6lvBEq4vnybBk6hZ6OP+yz8lW8K+uNmBejM4HubYKhAa7f47vn6sMLf4uE8FKf5e BUxWje7Yufcw2V4Xd+BsrrTnxM63IM2mFlaxSw+Gxq6df0NMRQII6ixnW0h+GngMpMQU Pu3Q== X-Received: by 10.68.190.103 with SMTP id gp7mr44905595pbc.74.1384400651377; Wed, 13 Nov 2013 19:44:11 -0800 (PST) Received: from localhost.localdomain ([39.7.52.201]) by mx.google.com with ESMTPSA id tu6sm47940292pbc.41.2013.11.13.19.44.00 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 13 Nov 2013 19:44:10 -0800 (PST) From: Daniel Jeong To: Mauro Carvalho Chehab Cc: Hans Verkuil , Daniel Jeong , , Sakari Ailus , Andy Shevchenko , , Dan Carpenter Subject: [PATCH -next] [media] media: i2c: lm3560: fix missing unlock error in lm3560_get_ctrl(). Date: Thu, 14 Nov 2013 12:43:27 +0900 Message-Id: <1384400607-18504-1-git-send-email-gshark.jeong@gmail.com> X-Mailer: git-send-email 1.7.9.5 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.14.33614 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' 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, __ANY_URI 0, __CP_URI_IN_BODY 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' Add the missing unlock before return from function lm3560_get_ctrl() to avoid deadlock. Thanks to Dan Carpenter. Signed-off-by: Daniel Jeong --- drivers/media/i2c/lm3560.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/media/i2c/lm3560.c b/drivers/media/i2c/lm3560.c index 3317a9a..5d6eef0 100644 --- a/drivers/media/i2c/lm3560.c +++ b/drivers/media/i2c/lm3560.c @@ -172,16 +172,16 @@ static int lm3560_flash_brt_ctrl(struct lm3560_flash *flash, static int lm3560_get_ctrl(struct v4l2_ctrl *ctrl, enum lm3560_led_id led_no) { struct lm3560_flash *flash = to_lm3560_flash(ctrl, led_no); + int rval = -EINVAL; mutex_lock(&flash->lock); if (ctrl->id == V4L2_CID_FLASH_FAULT) { - int rval; s32 fault = 0; unsigned int reg_val; rval = regmap_read(flash->regmap, REG_FLAG, ®_val); if (rval < 0) - return rval; + goto out; if (rval & FAULT_SHORT_CIRCUIT) fault |= V4L2_FLASH_FAULT_SHORT_CIRCUIT; if (rval & FAULT_OVERTEMP) @@ -189,11 +189,11 @@ static int lm3560_get_ctrl(struct v4l2_ctrl *ctrl, enum lm3560_led_id led_no) if (rval & FAULT_TIMEOUT) fault |= V4L2_FLASH_FAULT_TIMEOUT; ctrl->cur.val = fault; - return 0; } +out: mutex_unlock(&flash->lock); - return -EINVAL; + return rval; } static int lm3560_set_ctrl(struct v4l2_ctrl *ctrl, enum lm3560_led_id led_no)