ASoC: WM8903: Disallow all invalid gpio_cfg pdata values
authorStephen Warren <swarren@nvidia.com>
Thu, 1 Dec 2011 20:49:19 +0000 (13:49 -0700)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 2 Dec 2011 10:35:25 +0000 (10:35 +0000)
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>
sound/soc/codecs/wm8903.c

index d663c97785d776684d38bfa89f56ebbb5ff3ee9a..60ad8cdc046cb205bbe221d6fff990f3b0169936 100644 (file)
@@ -1936,11 +1936,11 @@ static int wm8903_probe(struct snd_soc_codec *codec)
                bool mic_gpio = false;
 
                for (i = 0; i < ARRAY_SIZE(pdata->gpio_cfg); i++) {
-                       if (pdata->gpio_cfg[i] == WM8903_GPIO_NO_CONFIG)
+                       if (pdata->gpio_cfg[i] > 0x7fff)
                                continue;
 
                        snd_soc_write(codec, WM8903_GPIO_CONTROL_1 + i,
-                                     pdata->gpio_cfg[i] & 0xffff);
+                                     pdata->gpio_cfg[i] & 0x7fff);
 
                        val = (pdata->gpio_cfg[i] & WM8903_GP1_FN_MASK)
                                >> WM8903_GP1_FN_SHIFT;