From patchwork Tue Feb 16 20:27:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olli Salonen X-Patchwork-Id: 8331341 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 1B941C02AA for ; Tue, 16 Feb 2016 20:27:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 47A8520212 for ; Tue, 16 Feb 2016 20:27:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E8157202E6 for ; Tue, 16 Feb 2016 20:27:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756044AbcBPU1U (ORCPT ); Tue, 16 Feb 2016 15:27:20 -0500 Received: from mail-lf0-f54.google.com ([209.85.215.54]:32928 "EHLO mail-lf0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755535AbcBPU1T (ORCPT ); Tue, 16 Feb 2016 15:27:19 -0500 Received: by mail-lf0-f54.google.com with SMTP id m1so115247053lfg.0 for ; Tue, 16 Feb 2016 12:27:19 -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; bh=utnmPVFbVl1MfUfzHDz+x/wj3rNM/M5YcLMeX8CKkWY=; b=Ycqw7kVGSaw6iKq90Py8yUnGYJamGXh2AGbDBPB6mfF+hRa2vEYJ+bRFTlFXU4sTo0 m5HfH6wQhPOMsmuHFax/Zo5tywCYZlIFz5SYReW99F5pdCaCr6uE4eKECyAZBR+uAjz0 gSGezYm0B/8vmhqbxdeldagQacUNG0PrG+2D6Ev/CY9yYZKoSGlgHDb6sFC7eZOq6Mpc 4XYx08ORr6BmTTymr3LEi0GMX5ClBCJ4+/93PQb743YhCg4sLLj6A08zxw+PNrzYljMW gp5dfz9A4u+iEW5l11YvRtyepXe2LT0PYl7+q6TZsJsyWGJH+82aE+EYF6ioJ0zXDQl7 EH/w== X-Gm-Message-State: AG10YOSMiOmyY85m4crSrZViiss7QPVot3qU0Cu5atZ7rnxHMpv2V8dTLueIVOJ8uuDnug== X-Received: by 10.25.65.5 with SMTP id o5mr10993280lfa.38.1455654438513; Tue, 16 Feb 2016 12:27:18 -0800 (PST) Received: from dl160.lan (87-93-106-106.bb.dnainternet.fi. [87.93.106.106]) by smtp.gmail.com with ESMTPSA id b10sm4402875lbs.37.2016.02.16.12.27.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 16 Feb 2016 12:27:17 -0800 (PST) From: Olli Salonen To: linux-media@vger.kernel.org Cc: stable@vger.kernel.org, Olli Salonen Subject: [PATCH] cx23885: incorrect I2C bus used in the CI registration Date: Tue, 16 Feb 2016 22:27:09 +0200 Message-Id: <1455654429-13234-1-git-send-email-olli.salonen@iki.fi> 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.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 This patch fixes a bug that was introduced by the commit: commit 2b0aac3011bc7a9db27791bed4978554263ef079 Author: Mauro Carvalho Chehab Date: Tue Dec 23 13:48:07 2014 -0200 [media] cx23885: move CI/MAC registration to a separate function Cc to stable, as this bug exists in all 4.x kernels. Signed-off-by: Olli Salonen --- drivers/media/pci/cx23885/cx23885-dvb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c index 5131c9f..6e40dec 100644 --- a/drivers/media/pci/cx23885/cx23885-dvb.c +++ b/drivers/media/pci/cx23885/cx23885-dvb.c @@ -1139,7 +1139,7 @@ static int dvb_register_ci_mac(struct cx23885_tsport *port) u8 eeprom[256]; /* 24C02 i2c eeprom */ struct sp2_config sp2_config; struct i2c_board_info info; - struct cx23885_i2c *i2c_bus2 = &dev->i2c_bus[1]; + struct cx23885_i2c *i2c_bus = &dev->i2c_bus[0]; /* attach CI */ memset(&sp2_config, 0, sizeof(sp2_config)); @@ -1151,7 +1151,7 @@ static int dvb_register_ci_mac(struct cx23885_tsport *port) info.addr = 0x40; info.platform_data = &sp2_config; request_module(info.type); - client_ci = i2c_new_device(&i2c_bus2->i2c_adap, &info); + client_ci = i2c_new_device(&i2c_bus->i2c_adap, &info); if (client_ci == NULL || client_ci->dev.driver == NULL) return -ENODEV; if (!try_module_get(client_ci->dev.driver->owner)) {