From patchwork Thu Feb 26 18:05:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 5895311 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0B115BF440 for ; Thu, 26 Feb 2015 18:06:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2E006203AA for ; Thu, 26 Feb 2015 18:05:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3DBFB203AC for ; Thu, 26 Feb 2015 18:05:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753747AbbBZSFz (ORCPT ); Thu, 26 Feb 2015 13:05:55 -0500 Received: from mail-we0-f174.google.com ([74.125.82.174]:33536 "EHLO mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752971AbbBZSFy (ORCPT ); Thu, 26 Feb 2015 13:05:54 -0500 Received: by wevk48 with SMTP id k48so13394167wev.0 for ; Thu, 26 Feb 2015 10:05:53 -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=GQUQ1LgWgcVODAsDu/dvtiae/AevxTds9A14eoscTL0=; b=Me/IdM591vBr1LHTyTc31maZYgnG0x4a8WqmgRZXRbaU821Sl3zN4KFY5ojuRTgkP/ XFq5T2K6d+EP8v3ePAT0Rx6hrBB9fGd6GpEpewnsQ6pv3J8saXTB2+vDNZB5bd19MDR5 etj6+p32dyvlyEi8k7jPbx+QT0Vsz6S9RF2biEsdTQ+4TcteBaz60mwcrjipOJFGopKg 1mY6JKPQ1Iw5zYNS5p5kb6GrVi4jWGktioKPa/p8FMYbePAWb/1IPY4NDtgWPDfwzKWn cVE9o9Vy0F0ydZPVxsfDMPWfG8GY48ROznDR7tZO4ipM7DlfDvZmDunQObtFDV3ar1VG gexA== X-Received: by 10.180.86.227 with SMTP id s3mr52686256wiz.58.1424973953451; Thu, 26 Feb 2015 10:05:53 -0800 (PST) Received: from tango-charlie.RL.local ([194.72.83.162]) by mx.google.com with ESMTPSA id bf8sm2433532wjb.37.2015.02.26.10.05.52 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Feb 2015 10:05:52 -0800 (PST) From: Lad Prabhakar To: Laurent Pinchart Cc: linux-media@vger.kernel.org, "Lad, Prabhakar" Subject: [PATCH] media: i2c: mt9p031: make sure we destroy the mutex Date: Thu, 26 Feb 2015 18:05:38 +0000 Message-Id: <1424973938-26121-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-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "Lad, Prabhakar" this patch makes sure to call mutex_destroy() in case of probe failure or module unload. Signed-off-by: Lad, Prabhakar Acked-by: Laurent Pinchart --- drivers/media/i2c/mt9p031.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/media/i2c/mt9p031.c b/drivers/media/i2c/mt9p031.c index e3acae9..af5a09d 100644 --- a/drivers/media/i2c/mt9p031.c +++ b/drivers/media/i2c/mt9p031.c @@ -1071,6 +1071,8 @@ static int mt9p031_probe(struct i2c_client *client, return ret; } + mutex_init(&mt9p031->power_lock); + v4l2_ctrl_handler_init(&mt9p031->ctrls, ARRAY_SIZE(mt9p031_ctrls) + 6); v4l2_ctrl_new_std(&mt9p031->ctrls, &mt9p031_ctrl_ops, @@ -1108,7 +1110,6 @@ static int mt9p031_probe(struct i2c_client *client, mt9p031->blc_offset = v4l2_ctrl_find(&mt9p031->ctrls, V4L2_CID_BLC_DIGITAL_OFFSET); - mutex_init(&mt9p031->power_lock); v4l2_i2c_subdev_init(&mt9p031->subdev, client, &mt9p031_subdev_ops); mt9p031->subdev.internal_ops = &mt9p031_subdev_internal_ops; @@ -1149,6 +1150,7 @@ done: if (ret < 0) { v4l2_ctrl_handler_free(&mt9p031->ctrls); media_entity_cleanup(&mt9p031->subdev.entity); + mutex_destroy(&mt9p031->power_lock); } return ret; @@ -1162,6 +1164,7 @@ static int mt9p031_remove(struct i2c_client *client) v4l2_ctrl_handler_free(&mt9p031->ctrls); v4l2_device_unregister_subdev(subdev); media_entity_cleanup(&subdev->entity); + mutex_destroy(&mt9p031->power_lock); return 0; }