From patchwork Sun Feb 28 18:29:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jemma Denson X-Patchwork-Id: 8447651 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 329B99F372 for ; Sun, 28 Feb 2016 18:30:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 67BD6202E9 for ; Sun, 28 Feb 2016 18:30:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5BB13202DD for ; Sun, 28 Feb 2016 18:30:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754213AbcB1SaA (ORCPT ); Sun, 28 Feb 2016 13:30:00 -0500 Received: from mail-wm0-f41.google.com ([74.125.82.41]:32918 "EHLO mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754124AbcB1S37 (ORCPT ); Sun, 28 Feb 2016 13:29:59 -0500 Received: by mail-wm0-f41.google.com with SMTP id l68so10762400wml.0 for ; Sun, 28 Feb 2016 10:29:58 -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=BPLVHbY05elvhfXMcrNJdDTCSuyxtx9QngW5mSlu5mg=; b=H4evQ3F9X0mzZc62+7kFYYdbz7y9+Xow/M+4PIrcH2t9fU3e0UQagukB04rbQgLXWc VdxMl9dwuve05QEMaWd78wlGtDUtuziTkI9IDQMGh2OhjaAjXnLEtiZI5hjRT38y+PNN aA67b4Xej+354kXcHcPS3Dv9wlve1jNtimu/jw/LzEu7CX6D31nDD3/bvvN2Ai8/tIWM uxndJMFBYGcnvSNG5HGwUivoxuaP3bbSz/rKeWMmbRwCGb4tnHkeXXZicVdQTpPNW34R XolW22AY5gXRFSnpspZ/28IBW0cOX3PNI6MIdKkIQxSaHRvA6cGvBCOYj9beQOJCYWF+ t9uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=BPLVHbY05elvhfXMcrNJdDTCSuyxtx9QngW5mSlu5mg=; b=FcZi5ehmPCLT1YATLtpr/MQ14b1kvjgNsTFeqA4bCDm6KT1ZE7zZ1LmNJMpz/YtWx3 wo5QlAVtx/cOXRCueuAaRW7CQUXqs2yeqSqPX0E8f0niWRs84aXODU9J3s47QV/duLXj vm2d2ptKX+JF7UGA+NryD/ufsLMDPNaldU+m7my7lUZUGuhVEg/UjRiFd2rZiIlqTMo+ GDjOIAwSwPfX2suedGfZRf5duVfHR3RkGSLgpmxSU8uq9rv+p9vBNbOnEOgOtAJw8RBB HhbUWt3YHfIqElooMllwPX3SO6mjR0YmhCSVZDycGupqgR4NZ+KR4GYegAEpxpJU/MVk xUtw== X-Gm-Message-State: AD7BkJLA8LIEYtZ3gFD9ZXb6omzqzDyXR1ubYjSUyXcGDfv7OeTFEnIaBlgKHSzd3Miujw== X-Received: by 10.194.23.37 with SMTP id j5mr10685743wjf.171.1456684198116; Sun, 28 Feb 2016 10:29:58 -0800 (PST) Received: from jemma-pc.denson.org.uk ([2001:470:6ad2:1:beae:c5ff:fe8c:e4a7]) by smtp.gmail.com with ESMTPSA id 202sm12674877wmo.7.2016.02.28.10.29.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Feb 2016 10:29:56 -0800 (PST) From: Jemma Denson To: Linux Media Mailing List Cc: Mauro Carvalho Chehab , Patrick Boettcher Subject: [PATCH] [media] cx24120: make sure tuner is locked at get_frontend Date: Sun, 28 Feb 2016 18:29:50 +0000 Message-Id: <1456684190-24713-1-git-send-email-jdenson@gmail.com> X-Mailer: git-send-email 2.5.0 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, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 Change get_frontend to re-check current lock status rather than relying on a cached value from get_status. Removes potential for tuning failure if get_frontend is called during tuning. Probably not too essential as other changes work around this: https://patchwork.linuxtv.org/patch/32845/ Signed-off-by: Jemma Denson --- drivers/media/dvb-frontends/cx24120.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/media/dvb-frontends/cx24120.c b/drivers/media/dvb-frontends/cx24120.c index 6ccbd86..066ee38 100644 --- a/drivers/media/dvb-frontends/cx24120.c +++ b/drivers/media/dvb-frontends/cx24120.c @@ -1507,11 +1507,13 @@ static int cx24120_get_frontend(struct dvb_frontend *fe, { struct cx24120_state *state = fe->demodulator_priv; u8 freq1, freq2, freq3; + int status; dev_dbg(&state->i2c->dev, "\n"); /* don't return empty data if we're not tuned in */ - if ((state->fe_status & FE_HAS_LOCK) == 0) + status = cx24120_readreg(state, CX24120_REG_STATUS); + if (!(status & CX24120_HAS_LOCK)) return 0; /* Get frequency */