From patchwork Wed Oct 27 13:45:32 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Drake X-Patchwork-Id: 285812 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9RDjkG8021008 for ; Wed, 27 Oct 2010 13:45:47 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761201Ab0J0Npm (ORCPT ); Wed, 27 Oct 2010 09:45:42 -0400 Received: from mtaout01-winn.ispmail.ntl.com ([81.103.221.47]:32336 "EHLO mtaout01-winn.ispmail.ntl.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756827Ab0J0Npm (ORCPT ); Wed, 27 Oct 2010 09:45:42 -0400 Received: from aamtaout03-winn.ispmail.ntl.com ([81.103.221.35]) by mtaout01-winn.ispmail.ntl.com (InterMail vM.7.08.04.00 201-2186-134-20080326) with ESMTP id <20101027134535.VXKY25742.mtaout01-winn.ispmail.ntl.com@aamtaout03-winn.ispmail.ntl.com>; Wed, 27 Oct 2010 14:45:35 +0100 Received: from zog.reactivated.net ([86.14.215.141]) by aamtaout03-winn.ispmail.ntl.com (InterMail vG.3.00.04.00 201-2196-133-20080908) with ESMTP id <20101027134535.MSBY28282.aamtaout03-winn.ispmail.ntl.com@zog.reactivated.net>; Wed, 27 Oct 2010 14:45:35 +0100 Received: by zog.reactivated.net (Postfix, from userid 1000) id 3E0DF9D401B; Wed, 27 Oct 2010 14:45:32 +0100 (BST) From: Daniel Drake To: mchehab@infradead.org Cc: linux-media@vger.kernel.org Cc: corbet@lwn.net Subject: [PATCH] cafe_ccic: fix subdev configuration Message-Id: <20101027134532.3E0DF9D401B@zog.reactivated.net> Date: Wed, 27 Oct 2010 14:45:32 +0100 (BST) X-Cloudmark-Analysis: v=1.1 cv=4QByPj+6Iq2k/6L54d+eVKTdgQxdscpRskJJReCfdXo= c=1 sm=0 a=OGEeBSmm_msA:10 a=Op-mwl0xAAAA:8 a=Kn--HfEfGpwgMILozm0A:9 a=fFfqoqWnyMnqiFcjSE3zM-KUXkAA:4 a=d4CUUju0HPYA:10 a=HpAAvcLHHh0Zw7uRqdWCyQ==:117 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 27 Oct 2010 13:45:47 +0000 (UTC) diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c index 8a07906..21f6f06 100644 --- a/drivers/media/video/cafe_ccic.c +++ b/drivers/media/video/cafe_ccic.c @@ -2065,8 +2065,9 @@ static int cafe_pci_probe(struct pci_dev *pdev, sensor_cfg.clock_speed = 45; cam->sensor_addr = 0x42; - cam->sensor = v4l2_i2c_new_subdev(&cam->v4l2_dev, &cam->i2c_adapter, - NULL, "ov7670", cam->sensor_addr, NULL); + cam->sensor = v4l2_i2c_new_subdev_cfg(&cam->v4l2_dev, &cam->i2c_adapter, + "ov7670", "ov7670", 0, &sensor_cfg, cam->sensor_addr, + NULL); if (cam->sensor == NULL) { ret = -ENODEV; goto out_smbus;