Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ASoC: Fix return value of wm5100_gpio_direction_out()

Browse source 
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>
This commit is contained in:
Mark Brown 2011-10-31 19:02:13 +00:00
parent 5a7c5f26df
commit 64964e8264
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sound/soc/codecs/wm5100.c
View file

@ -2361,13 +2361,17 @@ static int wm5100_gpio_direction_out(struct gpio_chip *chip,
{ {
struct wm5100_priv *wm5100 = gpio_to_wm5100(chip); struct wm5100_priv *wm5100 = gpio_to_wm5100(chip);
struct snd_soc_codec *codec = wm5100->codec; struct snd_soc_codec *codec = wm5100->codec;
int val; int val, ret;
val = (1 << WM5100_GP1_FN_SHIFT) | (!!value << WM5100_GP1_LVL_SHIFT); val = (1 << WM5100_GP1_FN_SHIFT) | (!!value << WM5100_GP1_LVL_SHIFT);
return snd_soc_update_bits(codec, WM5100_GPIO_CTRL_1 + offset, ret = snd_soc_update_bits(codec, WM5100_GPIO_CTRL_1 + offset,
WM5100_GP1_FN_MASK | WM5100_GP1_DIR | WM5100_GP1_FN_MASK | WM5100_GP1_DIR |
WM5100_GP1_LVL, val); WM5100_GP1_LVL, val);
if (ret < 0)
return ret;
else
return 0;
} }
static int wm5100_gpio_get(struct gpio_chip *chip, unsigned offset) static int wm5100_gpio_get(struct gpio_chip *chip, unsigned offset)