diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-09 15:15:17 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-09 15:15:17 -0200 |
| commit | feaba1cfa7f4825040ea17cec9408f3a4bba6dbd (patch) | |
| tree | d49aff3d69589f8f24c9b0fd9f6c6dda5f325bae /linux/drivers/media/video/cx18/cx18-av-firmware.c | |
| parent | 3fd8c59cdeaedaa51a5db45b8dbf67dc6b907e19 (diff) | |
| parent | 527d5f186187cc1a8c128b0aca06d047e7f753a4 (diff) | |
| download | mediapointer-dvb-s2-feaba1cfa7f4825040ea17cec9408f3a4bba6dbd.tar.gz mediapointer-dvb-s2-feaba1cfa7f4825040ea17cec9408f3a4bba6dbd.tar.bz2 | |
merge: http://linuxtv.org/hg/~awalls/cx18
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-av-firmware.c')
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-av-firmware.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-av-firmware.c b/linux/drivers/media/video/cx18/cx18-av-firmware.c index b374c74d3..940ea9352 100644 --- a/linux/drivers/media/video/cx18/cx18-av-firmware.c +++ b/linux/drivers/media/video/cx18/cx18-av-firmware.c @@ -131,7 +131,8 @@ int cx18_av_loadfw(struct cx18 *cx) v = cx18_read_reg(cx, CX18_AUDIO_ENABLE); /* If bit 11 is 1, clear bit 10 */ if (v & 0x800) - cx18_write_reg(cx, v & 0xFFFFFBFF, CX18_AUDIO_ENABLE); + cx18_write_reg_expect(cx, v & 0xFFFFFBFF, CX18_AUDIO_ENABLE, + 0, 0x400); /* Enable WW auto audio standard detection */ v = cx18_av_read4(cx, CXADEC_STD_DET_CTL); |