diff options
Diffstat (limited to 'sound/isa/wss/wss_lib.c')
-rw-r--r-- | sound/isa/wss/wss_lib.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sound/isa/wss/wss_lib.c b/sound/isa/wss/wss_lib.c index 2ba18978b419..5b9d6c18bc45 100644 --- a/sound/isa/wss/wss_lib.c +++ b/sound/isa/wss/wss_lib.c | |||
@@ -1682,7 +1682,7 @@ static void snd_wss_resume(struct snd_wss *chip) | |||
1682 | } | 1682 | } |
1683 | #endif /* CONFIG_PM */ | 1683 | #endif /* CONFIG_PM */ |
1684 | 1684 | ||
1685 | int snd_wss_free(struct snd_wss *chip) | 1685 | static int snd_wss_free(struct snd_wss *chip) |
1686 | { | 1686 | { |
1687 | release_and_free_resource(chip->res_port); | 1687 | release_and_free_resource(chip->res_port); |
1688 | release_and_free_resource(chip->res_cport); | 1688 | release_and_free_resource(chip->res_cport); |
@@ -1705,7 +1705,6 @@ int snd_wss_free(struct snd_wss *chip) | |||
1705 | kfree(chip); | 1705 | kfree(chip); |
1706 | return 0; | 1706 | return 0; |
1707 | } | 1707 | } |
1708 | EXPORT_SYMBOL(snd_wss_free); | ||
1709 | 1708 | ||
1710 | static int snd_wss_dev_free(struct snd_device *device) | 1709 | static int snd_wss_dev_free(struct snd_device *device) |
1711 | { | 1710 | { |
@@ -2225,7 +2224,7 @@ WSS_DOUBLE_TLV("Capture Volume", 0, CS4231_LEFT_INPUT, CS4231_RIGHT_INPUT, | |||
2225 | .get = snd_wss_get_mux, | 2224 | .get = snd_wss_get_mux, |
2226 | .put = snd_wss_put_mux, | 2225 | .put = snd_wss_put_mux, |
2227 | }, | 2226 | }, |
2228 | WSS_DOUBLE("Mic Boost", 0, | 2227 | WSS_DOUBLE("Mic Boost (+20dB)", 0, |
2229 | CS4231_LEFT_INPUT, CS4231_RIGHT_INPUT, 5, 5, 1, 0), | 2228 | CS4231_LEFT_INPUT, CS4231_RIGHT_INPUT, 5, 5, 1, 0), |
2230 | WSS_SINGLE("Loopback Capture Switch", 0, | 2229 | WSS_SINGLE("Loopback Capture Switch", 0, |
2231 | CS4231_LOOPBACK, 0, 1, 0), | 2230 | CS4231_LOOPBACK, 0, 1, 0), |
@@ -2236,14 +2235,14 @@ WSS_DOUBLE("Line Playback Switch", 0, | |||
2236 | WSS_DOUBLE_TLV("Line Playback Volume", 0, | 2235 | WSS_DOUBLE_TLV("Line Playback Volume", 0, |
2237 | CS4231_LEFT_LINE_IN, CS4231_RIGHT_LINE_IN, 0, 0, 31, 1, | 2236 | CS4231_LEFT_LINE_IN, CS4231_RIGHT_LINE_IN, 0, 0, 31, 1, |
2238 | db_scale_5bit_12db_max), | 2237 | db_scale_5bit_12db_max), |
2239 | WSS_SINGLE("Mono Playback Switch", 0, | 2238 | WSS_SINGLE("Beep Playback Switch", 0, |
2240 | CS4231_MONO_CTRL, 7, 1, 1), | 2239 | CS4231_MONO_CTRL, 7, 1, 1), |
2241 | WSS_SINGLE_TLV("Mono Playback Volume", 0, | 2240 | WSS_SINGLE_TLV("Beep Playback Volume", 0, |
2242 | CS4231_MONO_CTRL, 0, 15, 1, | 2241 | CS4231_MONO_CTRL, 0, 15, 1, |
2243 | db_scale_4bit), | 2242 | db_scale_4bit), |
2244 | WSS_SINGLE("Mono Output Playback Switch", 0, | 2243 | WSS_SINGLE("Mono Output Playback Switch", 0, |
2245 | CS4231_MONO_CTRL, 6, 1, 1), | 2244 | CS4231_MONO_CTRL, 6, 1, 1), |
2246 | WSS_SINGLE("Mono Output Playback Bypass", 0, | 2245 | WSS_SINGLE("Beep Bypass Playback Switch", 0, |
2247 | CS4231_MONO_CTRL, 5, 1, 0), | 2246 | CS4231_MONO_CTRL, 5, 1, 0), |
2248 | }; | 2247 | }; |
2249 | 2248 | ||