From patchwork Tue Feb 16 20:17:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olli Salonen X-Patchwork-Id: 8331331 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 D8E129F6E7 for ; Tue, 16 Feb 2016 20:18:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0D63A20263 for ; Tue, 16 Feb 2016 20:18:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2A7232022D for ; Tue, 16 Feb 2016 20:18:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752230AbcBPUSK (ORCPT ); Tue, 16 Feb 2016 15:18:10 -0500 Received: from mail-lf0-f51.google.com ([209.85.215.51]:35287 "EHLO mail-lf0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753355AbcBPUSH (ORCPT ); Tue, 16 Feb 2016 15:18:07 -0500 Received: by mail-lf0-f51.google.com with SMTP id l143so114597195lfe.2 for ; Tue, 16 Feb 2016 12:18:06 -0800 (PST) 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:in-reply-to :references; bh=bTgPzWhDiHObAfxLGsqZ88Do3GXEhv/vE56Hy+at5w0=; b=Zw5FCHe72vIoAhZ9AnZfcKOavWFutvMz4m6cynOae5UFmb2YzvkamrX7oziUyn20LZ /ZGbY9IK45mKFiV2T8GdeXrW4qZ6hgkY4xtyC6+ZihZEXRzvh9Z7dRw2F/VNMzCjsbcX L5RS9OM1ZF/YmaYkQWe91xj2ekMK/nzUZcNmhPCUBa8daINkh2UFvXzfee6sUBMhKm3b SohQ+jGaMLQzR9akPiUvabUG3QK9C0t2b/gq4Gx8U61IQLiZFk+m4V902FgYHguVAysc sedUWTH4pXieSAWMlgOZNNV7lL89rFhFfUumx7vUVRNPA1hvPe1eSaoM/hVInWEnkxaT hqKw== X-Gm-Message-State: AG10YOQ6qk9s3VytqMXWu6ViyUiYK4Ax2hoEbFQmMj59mTpM5y4SonZITjNN5kw9I+72IA== X-Received: by 10.25.85.145 with SMTP id j139mr10313642lfb.131.1455653886310; Tue, 16 Feb 2016 12:18:06 -0800 (PST) Received: from dl160.lan (87-93-106-106.bb.dnainternet.fi. [87.93.106.106]) by smtp.gmail.com with ESMTPSA id ph5sm3494947lbb.44.2016.02.16.12.18.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 16 Feb 2016 12:18:05 -0800 (PST) From: Olli Salonen To: linux-media@vger.kernel.org Cc: Olli Salonen Subject: [PATCH 2/2] cx23885: fix reversed I2C bus numbering Date: Tue, 16 Feb 2016 22:17:45 +0200 Message-Id: <1455653865-13005-2-git-send-email-olli.salonen@iki.fi> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1455653865-13005-1-git-send-email-olli.salonen@iki.fi> References: <1455653865-13005-1-git-send-email-olli.salonen@iki.fi> 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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 I2C buses for DVBSky T980C and S950C were numbered in an opposite way compared to every other board in the driver. Switch numbering to a more logical way. Signed-off-by: Olli Salonen --- drivers/media/pci/cx23885/cx23885-dvb.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c index 6e40dec..f041b69 100644 --- a/drivers/media/pci/cx23885/cx23885-dvb.c +++ b/drivers/media/pci/cx23885/cx23885-dvb.c @@ -1988,8 +1988,8 @@ static int dvb_register(struct cx23885_tsport *port) break; case CX23885_BOARD_DVBSKY_T980C: case CX23885_BOARD_TT_CT2_4500_CI: - i2c_bus = &dev->i2c_bus[1]; - i2c_bus2 = &dev->i2c_bus[0]; + i2c_bus = &dev->i2c_bus[0]; + i2c_bus2 = &dev->i2c_bus[1]; /* attach frontend */ memset(&si2168_config, 0, sizeof(si2168_config)); @@ -2001,7 +2001,7 @@ static int dvb_register(struct cx23885_tsport *port) info.addr = 0x64; info.platform_data = &si2168_config; request_module(info.type); - client_demod = i2c_new_device(&i2c_bus->i2c_adap, &info); + client_demod = i2c_new_device(&i2c_bus2->i2c_adap, &info); if (client_demod == NULL || client_demod->dev.driver == NULL) goto frontend_detach; if (!try_module_get(client_demod->dev.driver->owner)) { @@ -2030,13 +2030,13 @@ static int dvb_register(struct cx23885_tsport *port) port->i2c_client_tuner = client_tuner; break; case CX23885_BOARD_DVBSKY_S950C: - i2c_bus = &dev->i2c_bus[1]; - i2c_bus2 = &dev->i2c_bus[0]; + i2c_bus = &dev->i2c_bus[0]; + i2c_bus2 = &dev->i2c_bus[1]; /* attach frontend */ fe0->dvb.frontend = dvb_attach(m88ds3103_attach, &dvbsky_s950c_m88ds3103_config, - &i2c_bus->i2c_adap, &adapter); + &i2c_bus2->i2c_adap, &adapter); if (fe0->dvb.frontend == NULL) break;