aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx23885/cx23885-cards.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-12-01 21:08:34 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-01 21:08:34 -0200
commitba2dbfee128b22f2b16101293d9797b7333ba591 (patch)
treed1637bfd60108520397c838c7f884f6e105eddbd /drivers/media/video/cx23885/cx23885-cards.c
parentcc4e335f1bc468df7606f16bcb4a40e24b91735c (diff)
parent9a1f8b34aa539000da17a06235e4bec254d0bfb5 (diff)
Merge branch 'v4l_for_linus_rm_param' of /home/v4l/v4l/patchwork
* 'v4l_for_linus_rm_param' of /home/v4l/v4l/patchwork: [media] v4l: Remove module_name argument to the v4l2_i2c_new_subdev* functions [media] v4l: Remove hardcoded module names passed to v4l2_i2c_new_subdev* (2)
Diffstat (limited to 'drivers/media/video/cx23885/cx23885-cards.c')
-rw-r--r--drivers/media/video/cx23885/cx23885-cards.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index db054004e462..8861309268b1 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -1247,7 +1247,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
case CX23885_BOARD_LEADTEK_WINFAST_PXTV1200:
dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev,
&dev->i2c_bus[2].i2c_adap,
- NULL, "cx25840", 0x88 >> 1, NULL);
+ "cx25840", 0x88 >> 1, NULL);
if (dev->sd_cx25840) {
dev->sd_cx25840->grp_id = CX23885_HW_AV_CORE;
v4l2_subdev_call(dev->sd_cx25840, core, load_fw);

Privacy Policy