diff options
| author | Steven Toth <stoth@kernellabs.com> | 2011-10-10 11:09:55 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-10-14 17:19:27 -0300 |
| commit | 2cb9ccd4612907c0a30de9be1c694672e0cd8933 (patch) | |
| tree | 149ebe37ed88206630bb1b1a84a4574f7430593b /drivers/media/video/cx23885/cx23885-video.c | |
| parent | 52422e3cb146ef643fc0dbe74fa80f1abbe5fc37 (diff) | |
| download | talos-obmc-linux-2cb9ccd4612907c0a30de9be1c694672e0cd8933.tar.gz talos-obmc-linux-2cb9ccd4612907c0a30de9be1c694672e0cd8933.zip | |
[media] cx23885: Initial support for the MPX-885 mini-card
Signed-off-by: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx23885/cx23885-video.c')
| -rw-r--r-- | drivers/media/video/cx23885/cx23885-video.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c index adc8f78d4c58..f13c40e653c1 100644 --- a/drivers/media/video/cx23885/cx23885-video.c +++ b/drivers/media/video/cx23885/cx23885-video.c @@ -502,7 +502,8 @@ static int cx23885_video_mux(struct cx23885_dev *dev, unsigned int input) v4l2_subdev_call(dev->sd_cx25840, video, s_routing, INPUT(input)->vmux, 0, 0); - if (dev->board == CX23885_BOARD_HAUPPAUGE_HVR1800) { + if ((dev->board == CX23885_BOARD_HAUPPAUGE_HVR1800) || + (dev->board == CX23885_BOARD_MPX885)) { /* Configure audio routing */ v4l2_subdev_call(dev->sd_cx25840, audio, s_routing, INPUT(input)->amux, 0, 0); |
