summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx23885/cx23885-cards.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-04-24 01:33:08 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-04-24 01:33:08 -0300
commit005392231f73c7f7781c04eebf5869c0174f503e (patch)
treea261d186361d85d130fe033cc63d575421800727 /linux/drivers/media/video/cx23885/cx23885-cards.c
parent59964b28e0205cdf0a4465194f40867b7c7f5aa6 (diff)
parent2da45c822154d03cd7db86ac11b52385f1fac384 (diff)
downloadmediapointer-dvb-s2-005392231f73c7f7781c04eebf5869c0174f503e.tar.gz
mediapointer-dvb-s2-005392231f73c7f7781c04eebf5869c0174f503e.tar.bz2
merge: http://jusst.de/hg/v4l-dvb/
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx23885/cx23885-cards.c')
-rw-r--r--linux/drivers/media/video/cx23885/cx23885-cards.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx23885/cx23885-cards.c b/linux/drivers/media/video/cx23885/cx23885-cards.c
index 493551ec0..454470ffc 100644
--- a/linux/drivers/media/video/cx23885/cx23885-cards.c
+++ b/linux/drivers/media/video/cx23885/cx23885-cards.c
@@ -740,9 +740,10 @@ void cx23885_card_setup(struct cx23885_dev *dev)
case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
case CX23885_BOARD_NETUP_DUAL_DVBS2_CI:
- dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->i2c_bus[2].i2c_adap,
+ dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev,
+ &dev->i2c_bus[2].i2c_adap,
"cx25840", "cx25840", 0x88 >> 1);
- v4l2_subdev_call(dev->sd_cx25840, core, init, 0);
+ v4l2_subdev_call(dev->sd_cx25840, core, load_fw);
break;
}