From patchwork Sat Mar 22 13:01:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Frank Schaefer X-Patchwork-Id: 23179 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1WRLXV-0007RN-Tx; Sat, 22 Mar 2014 14:00:41 +0100 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-8) with esmtp id 1WRLXT-0005PZ-kl; Sat, 22 Mar 2014 14:00:41 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750900AbaCVNAg (ORCPT + 1 other); Sat, 22 Mar 2014 09:00:36 -0400 Received: from mail-ee0-f51.google.com ([74.125.83.51]:37070 "EHLO mail-ee0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750826AbaCVNAe (ORCPT ); Sat, 22 Mar 2014 09:00:34 -0400 Received: by mail-ee0-f51.google.com with SMTP id c13so2718779eek.24 for ; Sat, 22 Mar 2014 06:00:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=cmTGIw8jKVNWGmdeiGKAilm1U9QeJC6pGZrCHCBDh90=; b=QIz4Ev4DLmthv37jSv/RE+ZzUUrJCn7bP+7fhzcQtlNy6a9jLVIbqYKiugQnXvuaGe nWEKmfUgAviPkzw6eUpXERsiVd8TLbxNBLd7l/BOoGQivOLRIeFcAlKmx0qsHD1E/hqi nJ1iZLupyqrtlrDZlBSoXpvlDGPon/+gEIDMrnxKpQ3S7yltGd60DGLG67vU2sjOrqXG abXksvA0W5wcH8LgTRNsw7AboupHwdNnvhGK/Zjvn0HA/aZ+VUDBt/nNTmQrfc7NjRzT +pHoUC0Juxmq7hQOE+LqPNhreX5koVTys+3ib/V9dAc4CSc8uL+kxvZ5VwKEzCwWtR4U Kshg== X-Received: by 10.14.115.1 with SMTP id d1mr53586031eeh.30.1395493233333; Sat, 22 Mar 2014 06:00:33 -0700 (PDT) Received: from Athlon64X2-5000.site (ip-81-210-162-48.unitymediagroup.de. [81.210.162.48]) by mx.google.com with ESMTPSA id h47sm10902164eey.13.2014.03.22.06.00.32 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Mar 2014 06:00:32 -0700 (PDT) From: =?UTF-8?q?Frank=20Sch=C3=A4fer?= To: m.chehab@samsung.com Cc: linux-media@vger.kernel.org, =?UTF-8?q?Frank=20Sch=C3=A4fer?= Subject: [PATCH 2/5] em28xx: fix i2c_set_adapdata() call in em28xx_i2c_register() Date: Sat, 22 Mar 2014 14:01:00 +0100 Message-Id: <1395493263-2158-2-git-send-email-fschaefer.oss@googlemail.com> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1395493263-2158-1-git-send-email-fschaefer.oss@googlemail.com> References: <1395493263-2158-1-git-send-email-fschaefer.oss@googlemail.com> MIME-Version: 1.0 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: 2014.3.22.125114 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1000_LESS 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, BODY_SIZE_900_999 0, CT_TEXT_PLAIN_UTF8_CAPS 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __SXL_SIG_ERROR_SERVFAIL , __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' Signed-off-by: Frank Schäfer --- drivers/media/usb/em28xx/em28xx-i2c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/usb/em28xx/em28xx-i2c.c b/drivers/media/usb/em28xx/em28xx-i2c.c index ba6433c..04e8577 100644 --- a/drivers/media/usb/em28xx/em28xx-i2c.c +++ b/drivers/media/usb/em28xx/em28xx-i2c.c @@ -939,7 +939,7 @@ int em28xx_i2c_register(struct em28xx *dev, unsigned bus, dev->i2c_bus[bus].algo_type = algo_type; dev->i2c_bus[bus].dev = dev; dev->i2c_adap[bus].algo_data = &dev->i2c_bus[bus]; - i2c_set_adapdata(&dev->i2c_adap[bus], &dev->v4l2_dev); + i2c_set_adapdata(&dev->i2c_adap[bus], dev); retval = i2c_add_adapter(&dev->i2c_adap[bus]); if (retval < 0) {