From patchwork Fri Oct 5 20:44:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antti Palosaari X-Patchwork-Id: 1555971 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 364E1DF24C for ; Fri, 5 Oct 2012 20:45:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932901Ab2JEUpA (ORCPT ); Fri, 5 Oct 2012 16:45:00 -0400 Received: from mail.kapsi.fi ([217.30.184.167]:48968 "EHLO mail.kapsi.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932876Ab2JEUor (ORCPT ); Fri, 5 Oct 2012 16:44:47 -0400 Received: from dyn3-82-128-186-237.psoas.suomi.net ([82.128.186.237] helo=localhost.localdomain) by mail.kapsi.fi with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1TKElI-0002zq-RI; Fri, 05 Oct 2012 23:44:44 +0300 From: Antti Palosaari To: linux-media@vger.kernel.org Cc: Antti Palosaari , Michael Krufky Subject: [PATCH] mxl111sf: revert patch: fix error on stream stop in mxl111sf_ep6_streaming_ctrl() Date: Fri, 5 Oct 2012 23:44:17 +0300 Message-Id: <1349469857-21396-1-git-send-email-crope@iki.fi> X-Mailer: git-send-email 1.7.11.4 X-SA-Exim-Connect-IP: 82.128.186.237 X-SA-Exim-Mail-From: crope@iki.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org This reverts commits: 3fd7e4341e04f80e2605f56bbd8cb1e8b027901a [media] mxl111sf: remove an unused variable 3be5bb71fbf18f83cb88b54a62a78e03e5a4f30a [media] mxl111sf: fix error on stream stop in mxl111sf_ep6_streaming_ctrl() ...as bug behind these is fixed by the DVB USB v2. Cc: Michael Krufky Signed-off-by: Antti Palosaari --- drivers/media/usb/dvb-usb-v2/mxl111sf.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/media/usb/dvb-usb-v2/mxl111sf.c b/drivers/media/usb/dvb-usb-v2/mxl111sf.c index efdcb15..fcfe124 100644 --- a/drivers/media/usb/dvb-usb-v2/mxl111sf.c +++ b/drivers/media/usb/dvb-usb-v2/mxl111sf.c @@ -343,6 +343,7 @@ static int mxl111sf_ep6_streaming_ctrl(struct dvb_frontend *fe, int onoff) struct mxl111sf_state *state = fe_to_priv(fe); struct mxl111sf_adap_state *adap_state = &state->adap_state[fe->id]; int ret = 0; + u8 tmp; deb_info("%s(%d)\n", __func__, onoff); @@ -353,13 +354,15 @@ static int mxl111sf_ep6_streaming_ctrl(struct dvb_frontend *fe, int onoff) adap_state->ep6_clockphase, 0, 0); mxl_fail(ret); -#if 0 } else { ret = mxl111sf_disable_656_port(state); mxl_fail(ret); -#endif } + mxl111sf_read_reg(state, 0x12, &tmp); + tmp &= ~0x04; + mxl111sf_write_reg(state, 0x12, tmp); + return ret; }