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

Commit cec55827 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: rt5645: fix error handling for gpio detection 



Optional gpio handling should not cause an error status and prevent
probing if it's missing.  Remove error return for -ENOENT case and
move error message to dev_info

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent da369d0a

sound/soc/codecs/rt5645.c

+8 −2
Original line number Diff line number Diff line
@@ -3658,8 +3658,14 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, 
						       GPIOD_IN);



	if (IS_ERR(rt5645->gpiod_hp_det)) {

		dev_err(&i2c->dev, "failed to initialize gpiod\n");

		return PTR_ERR(rt5645->gpiod_hp_det);

		dev_info(&i2c->dev, "failed to initialize gpiod\n");

		ret = PTR_ERR(rt5645->gpiod_hp_det);

		/*

		 * Continue if optional gpiod is missing, bail for all other

		 * errors, including -EPROBE_DEFER

		 */

		if (ret != -ENOENT)

			return ret;

	}



	for (i = 0; i < ARRAY_SIZE(rt5645->supplies); i++)