diff options
author | Stephen Warren <swarren@nvidia.com> | 2011-12-01 15:49:19 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-02 05:35:25 -0500 |
commit | 6f526f0a86dbb22fd2fc5a873f55c9e2341a79c0 (patch) | |
tree | b083b7340cd2b765bea1737f721ce817d1f1c3b0 /sound | |
parent | 84b315ee893676e9a9ce8ac42ab5ef44e2af3ee1 (diff) |
ASoC: WM8903: Disallow all invalid gpio_cfg pdata values
The GPIO registers are 15 bits wide. Hence values, higher than 0x7fff are
not legal GPIO register values. Modify the pdata.gpio_cfg handling code
to reject all illegal values, not just WM8903_GPIO_NO_CONFIG (0x8000). This
will allow the later use of 0xffffffff as an invalid value in future device
tree bindings, meaning "don't touch this GPIO's configuration".
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/codecs/wm8903.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c index d663c97785d7..60ad8cdc046c 100644 --- a/sound/soc/codecs/wm8903.c +++ b/sound/soc/codecs/wm8903.c | |||
@@ -1936,11 +1936,11 @@ static int wm8903_probe(struct snd_soc_codec *codec) | |||
1936 | bool mic_gpio = false; | 1936 | bool mic_gpio = false; |
1937 | 1937 | ||
1938 | for (i = 0; i < ARRAY_SIZE(pdata->gpio_cfg); i++) { | 1938 | for (i = 0; i < ARRAY_SIZE(pdata->gpio_cfg); i++) { |
1939 | if (pdata->gpio_cfg[i] == WM8903_GPIO_NO_CONFIG) | 1939 | if (pdata->gpio_cfg[i] > 0x7fff) |
1940 | continue; | 1940 | continue; |
1941 | 1941 | ||
1942 | snd_soc_write(codec, WM8903_GPIO_CONTROL_1 + i, | 1942 | snd_soc_write(codec, WM8903_GPIO_CONTROL_1 + i, |
1943 | pdata->gpio_cfg[i] & 0xffff); | 1943 | pdata->gpio_cfg[i] & 0x7fff); |
1944 | 1944 | ||
1945 | val = (pdata->gpio_cfg[i] & WM8903_GP1_FN_MASK) | 1945 | val = (pdata->gpio_cfg[i] & WM8903_GP1_FN_MASK) |
1946 | >> WM8903_GP1_FN_SHIFT; | 1946 | >> WM8903_GP1_FN_SHIFT; |