Skip to content

Commit

Permalink
ASoC: cs4270: Check that we can enable regulators on resume
Browse files Browse the repository at this point in the history
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: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Timur Tabi <timur@freescale.com>
  • Loading branch information
Mark Brown committed Apr 1, 2012
1 parent 497098b commit ab92d09
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions sound/soc/codecs/cs4270.c
Original file line number Diff line number Diff line change
Expand Up @@ -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),
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. */
Expand Down

0 comments on commit ab92d09

Please sign in to comment.