From patchwork Fri Oct 4 14:48:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Alves X-Patchwork-Id: 20327 X-Patchwork-Delegate: mkrufky@linuxtv.org Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1VS6gG-0001J9-O9; Fri, 04 Oct 2013 16:48:36 +0200 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 1VS6gE-0004Ur-38; Fri, 04 Oct 2013 16:48:36 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754476Ab3JDOsd (ORCPT + 1 other); Fri, 4 Oct 2013 10:48:33 -0400 Received: from mail-we0-f171.google.com ([74.125.82.171]:41515 "EHLO mail-we0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754224Ab3JDOsc (ORCPT ); Fri, 4 Oct 2013 10:48:32 -0400 Received: by mail-we0-f171.google.com with SMTP id p61so4745635wes.30 for ; Fri, 04 Oct 2013 07:48:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=9UGd0PpeSN9fYjCfg/ahJbC7aWuADl0aejnYlZzu1KM=; b=KRQ4vLuShiOLEZo9YfmwkaoAKY4eAOos8+bKaBjjldKPj2QYzTexOpl/79JeZLaSKu h/6yI66OpQoNIQkH/OYTN5w3AAhqKL8qw6xiC4DwZcUNGaUv1DlX2JyaMv6Yw4/kjCgC HclfDiWhTgGbkBx/WSeZF/zn1A7C0EeY1XrgxB2CW+tL+io3UHYFHl20Zfso5M0s7uDV 0WiXR/zPUvxsCaTYZk3o3zVKt7rBnkIGPmztVNcSueieMhmBCUSQQyTDwOxQzg2+W3b1 7QOU3UdIjiyz4+Lqmgw4N8/f9HCaVTSBj60oSVy7ME5JmLqyYvbDfzcC7fJoW64mj+p/ ptlQ== X-Received: by 10.180.211.206 with SMTP id ne14mr7917948wic.30.1380898110853; Fri, 04 Oct 2013 07:48:30 -0700 (PDT) Received: from localhost.localdomain (a89-152-209-152.cpe.netcabo.pt. [89.152.209.152]) by mx.google.com with ESMTPSA id jf2sm10698865wic.2.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 04 Oct 2013 07:48:30 -0700 (PDT) From: Luis Alves To: linux-media@vger.kernel.org Cc: mkrufky@linuxtv.org, crope@iki.fi, mchehab@infradead.org, Luis Alves Subject: [PATCH] cx24117: Prevent mutex to be stuck on locked state if FE init fails. Date: Fri, 4 Oct 2013 15:48:35 +0100 Message-Id: <1380898115-30071-1-git-send-email-ljalvs@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.10.4.143914 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, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' Hi, This patch will fix the situation where the mutex was left in a locked state if for some reason the FE init failed. Regards, Luis Signed-off-by: Luis Alves Reviewed-by: Antti Palosaari --- drivers/media/dvb-frontends/cx24117.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/media/dvb-frontends/cx24117.c b/drivers/media/dvb-frontends/cx24117.c index 9087309..476b422 100644 --- a/drivers/media/dvb-frontends/cx24117.c +++ b/drivers/media/dvb-frontends/cx24117.c @@ -1238,11 +1238,11 @@ static int cx24117_initfe(struct dvb_frontend *fe) cmd.len = 3; ret = cx24117_cmd_execute_nolock(fe, &cmd); if (ret != 0) - return ret; + goto exit; ret = cx24117_diseqc_init(fe); if (ret != 0) - return ret; + goto exit; /* CMD 3C */ cmd.args[0] = 0x3c; @@ -1252,7 +1252,7 @@ static int cx24117_initfe(struct dvb_frontend *fe) cmd.len = 4; ret = cx24117_cmd_execute_nolock(fe, &cmd); if (ret != 0) - return ret; + goto exit; /* CMD 34 */ cmd.args[0] = 0x34; @@ -1260,9 +1260,8 @@ static int cx24117_initfe(struct dvb_frontend *fe) cmd.args[2] = CX24117_OCC; cmd.len = 3; ret = cx24117_cmd_execute_nolock(fe, &cmd); - if (ret != 0) - return ret; +exit: mutex_unlock(&state->priv->fe_lock); return ret;