From patchwork Mon Mar 2 15:00:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prabhakar X-Patchwork-Id: 28457 X-Patchwork-Delegate: kamil@wypas.org Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1YSRq6-0003zk-RD; Mon, 02 Mar 2015 16:00:58 +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-6) with esmtp id 1YSRq4-0006OI-5j; Mon, 02 Mar 2015 16:00:58 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754275AbbCBPAy (ORCPT + 1 other); Mon, 2 Mar 2015 10:00:54 -0500 Received: from mail-wg0-f48.google.com ([74.125.82.48]:46408 "EHLO mail-wg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752573AbbCBPAx (ORCPT ); Mon, 2 Mar 2015 10:00:53 -0500 Received: by wggy19 with SMTP id y19so33887929wgg.13 for ; Mon, 02 Mar 2015 07:00:51 -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=wSWvphaNTgII8Ocx12wgPZ0sn+VGR6n+V9rXZlQ9okY=; b=HplGMmjO3ZdV3uQsbpYBkoZ/4p6wnRnITgOPYDXaJAJaWHCqSkwplLppSg1L/x1lQp ySX28lPwoj7Kb9K4kU6r5tl0TFoy8DbIQutsN9DcMZcOObYuuexnjF+YseRx3DubWZKL ZXlc2X3sDLi0CJ0XW9Qt3NfhxOAWRvCqVdk6Fk/Fi929TOmV43lZdLRMhx3Bd5vqE3z3 0afT0Y6Sh/10sIqJNEc8mtAUdmu73oH4MnoGvWL139Gt+FtbKSFIDRau2HTNWsyEC9S3 bAN7xx217w8Q86zVMQRxHsvNwf6nV8SMa7jQSc9ySvYUkIxNemMb+DVOgc+NQp9Km7Dx v8HQ== X-Received: by 10.194.60.203 with SMTP id j11mr60569478wjr.5.1425308451733; Mon, 02 Mar 2015 07:00:51 -0800 (PST) Received: from tango-charlie.RL.local ([194.72.83.162]) by mx.google.com with ESMTPSA id gf11sm1271716wic.18.2015.03.02.07.00.50 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 02 Mar 2015 07:00:50 -0800 (PST) From: Lad Prabhakar To: Kyungmin Park , Andrzej Hajda Cc: linux-media@vger.kernel.org, "Lad, Prabhakar" Subject: [PATCH] media: i2c: s5c73m3: make sure we destroy the mutex Date: Mon, 2 Mar 2015 15:00:34 +0000 Message-Id: <1425308434-26549-1-git-send-email-prabhakar.csengg@gmail.com> X-Mailer: git-send-email 1.9.1 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: 2015.3.2.145122 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_1400_1499 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, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' From: "Lad, Prabhakar" Make sure to call mutex_destroy() in case of probe failure or module unload. Signed-off-by: Lad, Prabhakar --- drivers/media/i2c/s5c73m3/s5c73m3-core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/media/i2c/s5c73m3/s5c73m3-core.c b/drivers/media/i2c/s5c73m3/s5c73m3-core.c index ee0f57e..da0b3a3 100644 --- a/drivers/media/i2c/s5c73m3/s5c73m3-core.c +++ b/drivers/media/i2c/s5c73m3/s5c73m3-core.c @@ -1658,7 +1658,6 @@ static int s5c73m3_probe(struct i2c_client *client, if (ret < 0) return ret; - mutex_init(&state->lock); sd = &state->sensor_sd; oif_sd = &state->oif_sd; @@ -1695,6 +1694,8 @@ static int s5c73m3_probe(struct i2c_client *client, if (ret < 0) return ret; + mutex_init(&state->lock); + ret = s5c73m3_configure_gpios(state); if (ret) goto out_err; @@ -1754,6 +1755,7 @@ out_err1: s5c73m3_unregister_spi_driver(state); out_err: media_entity_cleanup(&sd->entity); + mutex_destroy(&state->lock); return ret; } @@ -1772,6 +1774,7 @@ static int s5c73m3_remove(struct i2c_client *client) media_entity_cleanup(&sensor_sd->entity); s5c73m3_unregister_spi_driver(state); + mutex_destroy(&state->lock); return 0; }