diff options
author | Hans Verkuil | 2007-08-07 12:16:07 +0200 |
---|---|---|
committer | Mauro Carvalho Chehab | 2007-10-10 03:05:38 +0200 |
commit | 8267761881d6bb91c168ba4d629b778cf106c485 (patch) | |
tree | df19f79da1116ab86cf10f3147412e556dcef0c5 /drivers/media/video/cx25840/cx25840-core.c | |
parent | V4L/DVB (6050): ivtv: retry/timer improvements (diff) | |
download | kernel-qcow2-linux-8267761881d6bb91c168ba4d629b778cf106c485.tar.gz kernel-qcow2-linux-8267761881d6bb91c168ba4d629b778cf106c485.tar.xz kernel-qcow2-linux-8267761881d6bb91c168ba4d629b778cf106c485.zip |
V4L/DVB (6051): cx25840: make proper use of SOFT_RESET
Whenever the 0x80b register is used the microcontroller should be reset.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx25840/cx25840-core.c')
-rw-r--r-- | drivers/media/video/cx25840/cx25840-core.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c index 8f9c32613b45..ae90d1c3d12b 100644 --- a/drivers/media/video/cx25840/cx25840-core.c +++ b/drivers/media/video/cx25840/cx25840-core.c @@ -250,6 +250,7 @@ static void input_change(struct i2c_client *client) } cx25840_and_or(client, 0x401, ~0x60, 0); cx25840_and_or(client, 0x401, ~0x60, 0x60); + cx25840_and_or(client, 0x810, ~0x01, 1); if (state->radio) { cx25840_write(client, 0x808, 0xf9); @@ -284,11 +285,7 @@ static void input_change(struct i2c_client *client) cx25840_write(client, 0x80b, 0x10); } - if (cx25840_read(client, 0x803) & 0x10) { - /* restart audio decoder microcontroller */ - cx25840_and_or(client, 0x803, ~0x10, 0x00); - cx25840_and_or(client, 0x803, ~0x10, 0x10); - } + cx25840_and_or(client, 0x810, ~0x01, 0); } static int set_input(struct i2c_client *client, enum cx25840_video_input vid_input, |