diff options
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-video.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-video.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index 1f1640f0f..6a420d6db 100644 --- a/linux/drivers/media/video/cx88/cx88-video.c +++ b/linux/drivers/media/video/cx88/cx88-video.c @@ -477,6 +477,14 @@ static int video_mux(struct cx88_core *core, unsigned int input) cx_clear(MO_FILTER_ODD, 0x00002020); break; } + + if (cx88_boards[core->board].mpeg & CX88_MPEG_BLACKBIRD) { + /* sets sound input from external adc */ + if (INPUT(input)->extadc) + cx_set(AUD_CTL, EN_I2SIN_ENABLE); + else + cx_clear(AUD_CTL, EN_I2SIN_ENABLE); + } return 0; } @@ -2057,7 +2065,11 @@ static void cx8800_vid_irq(struct cx8800_dev *dev) } } +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) static irqreturn_t cx8800_irq(int irq, void *dev_id, struct pt_regs *regs) +#else +static irqreturn_t cx8800_irq(int irq, void *dev_id) +#endif { struct cx8800_dev *dev = dev_id; struct cx88_core *core = dev->core; |