diff options
-rw-r--r-- | drivers/media/video/tvaudio.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c index 55b39b9a33d9..779ce7f865c3 100644 --- a/drivers/media/video/tvaudio.c +++ b/drivers/media/video/tvaudio.c | |||
@@ -106,7 +106,6 @@ struct CHIPDESC { | |||
106 | int inputmute; | 106 | int inputmute; |
107 | int inputmask; | 107 | int inputmask; |
108 | }; | 108 | }; |
109 | static struct CHIPDESC chiplist[]; | ||
110 | 109 | ||
111 | /* current state of the chip */ | 110 | /* current state of the chip */ |
112 | struct CHIPSTATE { | 111 | struct CHIPSTATE { |
@@ -1856,11 +1855,13 @@ static int chip_command(struct i2c_client *client, | |||
1856 | case VIDIOC_S_FREQUENCY: | 1855 | case VIDIOC_S_FREQUENCY: |
1857 | chip->mode = 0; /* automatic */ | 1856 | chip->mode = 0; /* automatic */ |
1858 | 1857 | ||
1859 | /* For chips that provide getmode, setmode and checkmode, | 1858 | /* For chips that provide getmode and setmode, and doesn't |
1860 | a kthread is created to automatically to set the audio | 1859 | automatically follows the stereo carrier, a kthread is |
1861 | standard. In this case, start with MONO and wait 2 seconds | 1860 | created to set the audio standard. In this case, when then |
1862 | for the decoding to stablize. Then, run kthread to change | 1861 | the video channel is changed, tvaudio starts on MONO mode. |
1863 | to stereo, if carrier detected. | 1862 | After waiting for 2 seconds, the kernel thread is called, |
1863 | to follow whatever audio standard is pointed by the | ||
1864 | audio carrier. | ||
1864 | */ | 1865 | */ |
1865 | if (chip->thread) { | 1866 | if (chip->thread) { |
1866 | desc->setmode(chip,V4L2_TUNER_MODE_MONO); | 1867 | desc->setmode(chip,V4L2_TUNER_MODE_MONO); |
@@ -1905,9 +1906,3 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = { | |||
1905 | .legacy_probe = chip_legacy_probe, | 1906 | .legacy_probe = chip_legacy_probe, |
1906 | .id_table = chip_id, | 1907 | .id_table = chip_id, |
1907 | }; | 1908 | }; |
1908 | |||
1909 | /* | ||
1910 | * Local variables: | ||
1911 | * c-basic-offset: 8 | ||
1912 | * End: | ||
1913 | */ | ||