diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-09 15:36:08 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-09 15:36:08 -0200 |
| commit | 65d583309cc02a4b3cedbdfaf1271c89e638410f (patch) | |
| tree | 66636f3713cb3052714d58d0e0bdcd1aaebb5855 /linux/drivers/media/video/cx18/cx18-audio.c | |
| parent | 652bc6f0e4e31f82785b9a94e7b770b2ba310097 (diff) | |
| parent | 5799331703b7837fcfbef38d643300b2b8da0ba6 (diff) | |
| download | mediapointer-dvb-s2-65d583309cc02a4b3cedbdfaf1271c89e638410f.tar.gz mediapointer-dvb-s2-65d583309cc02a4b3cedbdfaf1271c89e638410f.tar.bz2 | |
merge: http://linuxtv.org/hg/~dougsland/v4l-dvb/
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx18/cx18-audio.c')
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-audio.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-audio.c b/linux/drivers/media/video/cx18/cx18-audio.c index 57beddf0a..d19bd778c 100644 --- a/linux/drivers/media/video/cx18/cx18-audio.c +++ b/linux/drivers/media/video/cx18/cx18-audio.c @@ -64,8 +64,7 @@ int cx18_audio_set_io(struct cx18 *cx) val = cx18_read_reg(cx, CX18_AUDIO_ENABLE) & ~0x30; val |= (audio_input > CX18_AV_AUDIO_SERIAL2) ? 0x20 : (audio_input << 4); - cx18_write_reg(cx, val | 0xb00, CX18_AUDIO_ENABLE); - cx18_vapi(cx, CX18_APU_RESETAI, 1, 0); + cx18_write_reg_expect(cx, val | 0xb00, CX18_AUDIO_ENABLE, val, 0x30); return 0; } |