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

Commit 5574f774 authored by Daniel Mack's avatar Daniel Mack Committed by Mark Brown
Browse files

ASoC: cs4271: free allocated GPIO 



In case of probe deferral, the allocated GPIO line is not freed, which
prevents it from being claimed and properly asserted in later attempts.

Fix this by using devm_gpio_request().

Signed-off-by: default avatarDaniel Mack <zonque@gmail.com>
Reported-by: default avatarMichael Hirsch <hirsch@teufel.de>
Cc: Alexander Sverdlin <subaparts@yandex.ru>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 77b67063

sound/soc/codecs/cs4271.c

+3 −8
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ static int cs4271_probe(struct snd_soc_codec *codec) 
		gpio_nreset = cs4271plat->gpio_nreset;



	if (gpio_nreset >= 0)

		if (gpio_request(gpio_nreset, "CS4271 Reset"))

		if (devm_gpio_request(codec->dev, gpio_nreset, "CS4271 Reset"))

			gpio_nreset = -EINVAL;

	if (gpio_nreset >= 0) {

		/* Reset codec */
@@ -535,15 +535,10 @@ static int cs4271_probe(struct snd_soc_codec *codec) 
static int cs4271_remove(struct snd_soc_codec *codec)

{

	struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec);

	int gpio_nreset;



	gpio_nreset = cs4271->gpio_nreset;



	if (gpio_is_valid(gpio_nreset)) {

	if (gpio_is_valid(cs4271->gpio_nreset))

		/* Set codec to the reset state */

		gpio_set_value(gpio_nreset, 0);

		gpio_free(gpio_nreset);

	}

		gpio_set_value(cs4271->gpio_nreset, 0);



	return 0;

};