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

Commit ab92d09d authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: cs4270: Check that we can enable regulators on resume



It's possible that the regulator enable will fail and if it does we may
as well just give up with trying to bring the rest of the device up and
report the original error.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarTimur Tabi <timur@freescale.com>
parent 497098be
Loading
Loading
Loading
Loading
+5 −3
Original line number Diff line number Diff line
@@ -600,10 +600,12 @@ static int cs4270_soc_suspend(struct snd_soc_codec *codec)
static int cs4270_soc_resume(struct snd_soc_codec *codec)
{
	struct cs4270_private *cs4270 = snd_soc_codec_get_drvdata(codec);
	int reg;
	int reg, ret;

	regulator_bulk_enable(ARRAY_SIZE(cs4270->supplies),
	ret = regulator_bulk_enable(ARRAY_SIZE(cs4270->supplies),
				    cs4270->supplies);
	if (ret != 0)
		return ret;

	/* In case the device was put to hard reset during sleep, we need to
	 * wait 500ns here before any I2C communication. */