diff options
author | Steven Toth <stoth@hauppauge.com> | 2006-09-25 12:43:45 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-10-03 15:13:54 -0300 |
commit | 3a5ba52a1a1981c51af8f3559c16feaa238b2fec (patch) | |
tree | e2881b38f57f7cdbb0811d8d8782cbe1458ba768 /drivers/media/video/cx88/cx88-tvaudio.c | |
parent | 3057906df5c9be9c99a181eccac3bc40cf07ad9f (diff) | |
download | kernel_samsung_smdk4412-3a5ba52a1a1981c51af8f3559c16feaa238b2fec.zip kernel_samsung_smdk4412-3a5ba52a1a1981c51af8f3559c16feaa238b2fec.tar.gz kernel_samsung_smdk4412-3a5ba52a1a1981c51af8f3559c16feaa238b2fec.tar.bz2 |
V4L/DVB (4667): Changed cx88_board .dvb and .register to an enum.
Some basic cleanup in preperation for a future patch where
the cx88-mpeg functions have to deal with the port being
used by multiple frontends in (mpeg2 hw encoder and dvb demod).
Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx88/cx88-tvaudio.c')
-rw-r--r-- | drivers/media/video/cx88/cx88-tvaudio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c index 741e7c5e..b6e2bf9 100644 --- a/drivers/media/video/cx88/cx88-tvaudio.c +++ b/drivers/media/video/cx88/cx88-tvaudio.c @@ -142,7 +142,7 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl) cx_write(AUD_RATE_THRES_DMD, 0x000000C0); cx88_start_audio_dma(core); - if (cx88_boards[core->board].blackbird) { + if (cx88_boards[core->board].mpeg & CX88_BOARD_BLACKBIRD) { /* sets sound input from external adc */ switch (core->board) { case CX88_BOARD_HAUPPAUGE_ROSLYN: @@ -164,7 +164,7 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl) cx_write(AUD_I2SCNTL, 0); /* cx_write(AUD_APB_IN_RATE_ADJ, 0); */ } - if ((always_analog) || (!cx88_boards[core->board].blackbird)) { + if ((always_analog) || (!(cx88_boards[core->board].mpeg & CX88_BOARD_BLACKBIRD))) { ctl |= EN_DAC_ENABLE; cx_write(AUD_CTL, ctl); } |