V4L/DVB (11297): cx23885: convert to v4l2_subdev.

[linux-2.6-omap-h63xx.git] / drivers / media / video / cx23885 / cx23885-cards.c

diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index 08cd793cd151522f463e92ffa843f2b4858b8d9b..5e4b7e790d9498f6235bd612696c38d4cb975669 100644 (file)
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -739,7 +739,9 @@ 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:
-               request_module("cx25840");
+               dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->i2c_bus[2].i2c_adap,
+                               "cx25840", "cx25840", 0x88 >> 1);
+               v4l2_subdev_call(dev->sd_cx25840, core, init, 0);
                break;
        }