Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 64964e82644e9f809dc83019186c21ed5b70aa56

Authored by Mark Brown
1 parent 5a7c5f26df
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

ASoC: Fix return value of wm5100_gpio_direction_out() 

We can't just pass back the return value of snd_soc_update_bits() as it
will be 1 if a bit changed rather than zero.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

Showing 1 changed file with 8 additions and 4 deletions Side-by-side Diff

sound/soc/codecs/wm5100.c
Diff comments   View file @ 64964e8
... ... @@ -2361,13 +2361,17 @@
2361 2361 {
2362 2362 struct wm5100_priv *wm5100 = gpio_to_wm5100(chip);
2363 2363 struct snd_soc_codec *codec = wm5100->codec;
2364   - int val;
  2364 + int val, ret;
2365 2365  
2366 2366 val = (1 << WM5100_GP1_FN_SHIFT) | (!!value << WM5100_GP1_LVL_SHIFT);
2367 2367  
2368   - return snd_soc_update_bits(codec, WM5100_GPIO_CTRL_1 + offset,
2369   - WM5100_GP1_FN_MASK | WM5100_GP1_DIR |
2370   - WM5100_GP1_LVL, val);
  2368 + ret = snd_soc_update_bits(codec, WM5100_GPIO_CTRL_1 + offset,
  2369 + WM5100_GP1_FN_MASK | WM5100_GP1_DIR |
  2370 + WM5100_GP1_LVL, val);
  2371 + if (ret < 0)
  2372 + return ret;
  2373 + else
  2374 + return 0;
2371 2375 }
2372 2376  
2373 2377 static int wm5100_gpio_get(struct gpio_chip *chip, unsigned offset)