summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx23885/cx23885-cards.c
diff options
context:
space:
mode:
authorSteven Toth2008-04-19 06:36:06 +0200
committerMauro Carvalho Chehab2008-04-24 19:09:44 +0200
commitce89cfb4908bcebba3fb0cd2956d676e06043ef1 (patch)
tree174ba5198254eb0508f799e667daa69c412d071b /drivers/media/video/cx23885/cx23885-cards.c
parentV4L/DVB (7647): Add support for the Hauppauge HVR-1700 digital mode (diff)
downloadkernel-qcow2-linux-ce89cfb4908bcebba3fb0cd2956d676e06043ef1.tar.gz
kernel-qcow2-linux-ce89cfb4908bcebba3fb0cd2956d676e06043ef1.tar.xz
kernel-qcow2-linux-ce89cfb4908bcebba3fb0cd2956d676e06043ef1.zip
V4L/DVB (7648): cx23885: Load any module dependencies accordingly
For boards that require the avcore (cx25840) to be active, ensure it gets loaded. Signed-off-by: Steven Toth <stoth@hauppauge.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx23885/cx23885-cards.c')
-rw-r--r--drivers/media/video/cx23885/cx23885-cards.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index 84636ffc64dc..859510f7469c 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -431,6 +431,16 @@ void cx23885_card_setup(struct cx23885_dev *dev)
ts2->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
}
+ /* Certain boards support analog, or require the avcore to be
+ * loaded, ensure this happens.
+ */
+ switch (dev->board) {
+ case CX23885_BOARD_HAUPPAUGE_HVR1800:
+ case CX23885_BOARD_HAUPPAUGE_HVR1800lp:
+ case CX23885_BOARD_HAUPPAUGE_HVR1700:
+ request_module("cx25840");
+ break;
+ }
}
/* ------------------------------------------------------------------ */