diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-05-24 09:01:58 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-08-08 22:43:04 -0400 |
commit | ebc3bba5833e7021336f09767347a52448a60bc5 (patch) | |
tree | 02639770015eadf32693d6888ebfe29316df7e8d /drivers/media/video/msp3400-kthreads.c | |
parent | e356054337fe42a1b98725c8e68d6599764888b9 (diff) |
V4L/DVB: msp3400: convert to the new control framework
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/msp3400-kthreads.c')
-rw-r--r-- | drivers/media/video/msp3400-kthreads.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/video/msp3400-kthreads.c b/drivers/media/video/msp3400-kthreads.c index d5a69c5ee5e4..b376fcdee652 100644 --- a/drivers/media/video/msp3400-kthreads.c +++ b/drivers/media/video/msp3400-kthreads.c | |||
@@ -496,13 +496,13 @@ restart: | |||
496 | v4l_dbg(1, msp_debug, client, | 496 | v4l_dbg(1, msp_debug, client, |
497 | "thread: no carrier scan\n"); | 497 | "thread: no carrier scan\n"); |
498 | state->scan_in_progress = 0; | 498 | state->scan_in_progress = 0; |
499 | msp_set_audio(client); | 499 | msp_update_volume(state); |
500 | continue; | 500 | continue; |
501 | } | 501 | } |
502 | 502 | ||
503 | /* mute audio */ | 503 | /* mute audio */ |
504 | state->scan_in_progress = 1; | 504 | state->scan_in_progress = 1; |
505 | msp_set_audio(client); | 505 | msp_update_volume(state); |
506 | 506 | ||
507 | msp3400c_set_mode(client, MSP_MODE_AM_DETECT); | 507 | msp3400c_set_mode(client, MSP_MODE_AM_DETECT); |
508 | val1 = val2 = 0; | 508 | val1 = val2 = 0; |
@@ -634,7 +634,7 @@ no_second: | |||
634 | /* unmute */ | 634 | /* unmute */ |
635 | state->scan_in_progress = 0; | 635 | state->scan_in_progress = 0; |
636 | msp3400c_set_audmode(client); | 636 | msp3400c_set_audmode(client); |
637 | msp_set_audio(client); | 637 | msp_update_volume(state); |
638 | 638 | ||
639 | if (msp_debug) | 639 | if (msp_debug) |
640 | msp3400c_print_mode(client); | 640 | msp3400c_print_mode(client); |
@@ -679,13 +679,13 @@ restart: | |||
679 | v4l_dbg(1, msp_debug, client, | 679 | v4l_dbg(1, msp_debug, client, |
680 | "thread: no carrier scan\n"); | 680 | "thread: no carrier scan\n"); |
681 | state->scan_in_progress = 0; | 681 | state->scan_in_progress = 0; |
682 | msp_set_audio(client); | 682 | msp_update_volume(state); |
683 | continue; | 683 | continue; |
684 | } | 684 | } |
685 | 685 | ||
686 | /* mute audio */ | 686 | /* mute audio */ |
687 | state->scan_in_progress = 1; | 687 | state->scan_in_progress = 1; |
688 | msp_set_audio(client); | 688 | msp_update_volume(state); |
689 | 689 | ||
690 | /* start autodetect. Note: autodetect is not supported for | 690 | /* start autodetect. Note: autodetect is not supported for |
691 | NTSC-M and radio, hence we force the standard in those | 691 | NTSC-M and radio, hence we force the standard in those |
@@ -797,7 +797,7 @@ restart: | |||
797 | /* unmute */ | 797 | /* unmute */ |
798 | msp3400c_set_audmode(client); | 798 | msp3400c_set_audmode(client); |
799 | state->scan_in_progress = 0; | 799 | state->scan_in_progress = 0; |
800 | msp_set_audio(client); | 800 | msp_update_volume(state); |
801 | 801 | ||
802 | /* monitor tv audio mode, the first time don't wait | 802 | /* monitor tv audio mode, the first time don't wait |
803 | so long to get a quick stereo/bilingual result */ | 803 | so long to get a quick stereo/bilingual result */ |
@@ -974,7 +974,7 @@ restart: | |||
974 | v4l_dbg(1, msp_debug, client, | 974 | v4l_dbg(1, msp_debug, client, |
975 | "thread: no carrier scan\n"); | 975 | "thread: no carrier scan\n"); |
976 | state->scan_in_progress = 0; | 976 | state->scan_in_progress = 0; |
977 | msp_set_audio(client); | 977 | msp_update_volume(state); |
978 | continue; | 978 | continue; |
979 | } | 979 | } |
980 | 980 | ||
@@ -1020,7 +1020,7 @@ unmute: | |||
1020 | } | 1020 | } |
1021 | 1021 | ||
1022 | /* unmute: dispatch sound to scart output, set scart volume */ | 1022 | /* unmute: dispatch sound to scart output, set scart volume */ |
1023 | msp_set_audio(client); | 1023 | msp_update_volume(state); |
1024 | 1024 | ||
1025 | /* restore ACB */ | 1025 | /* restore ACB */ |
1026 | if (msp_write_dsp(client, 0x13, state->acb)) | 1026 | if (msp_write_dsp(client, 0x13, state->acb)) |