Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe75fe0e authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

ASoC: Fix return value of wm8962_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: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 16aff769

sound/soc/codecs/wm8962.c

+7 −3
Original line number Diff line number Diff line
@@ -3878,13 +3878,17 @@ static int wm8962_gpio_direction_out(struct gpio_chip *chip, 
{

	struct wm8962_priv *wm8962 = gpio_to_wm8962(chip);

	struct snd_soc_codec *codec = wm8962->codec;

	int val;

	int ret, val;



	/* Force function 1 (logic output) */

	val = (1 << WM8962_GP2_FN_SHIFT) | (value << WM8962_GP2_LVL_SHIFT);



	return snd_soc_update_bits(codec, WM8962_GPIO_BASE + offset,

	ret = snd_soc_update_bits(codec, WM8962_GPIO_BASE + offset,

				  WM8962_GP2_FN_MASK | WM8962_GP2_LVL, val);

	if (ret < 0)

		return ret;



	return 0;

}



static struct gpio_chip wm8962_template_chip = {