diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-19 16:15:43 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-01 11:28:28 +0100 |
| commit | ab92d09d1306c738b751b839d81e867af1039d14 (patch) | |
| tree | 390b748a7b2f58eba32a60b25961330f3c29d5d6 | |
| parent | 497098beffaa898ea9fa0076e626f055ef5c832e (diff) | |
| download | op-kernel-dev-ab92d09d1306c738b751b839d81e867af1039d14.zip op-kernel-dev-ab92d09d1306c738b751b839d81e867af1039d14.tar.gz | |
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: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Timur Tabi <timur@freescale.com>
| -rw-r--r-- | sound/soc/codecs/cs4270.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c index 1d672f5..df8fe38 100644 --- a/sound/soc/codecs/cs4270.c +++ b/sound/soc/codecs/cs4270.c @@ -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. */ |
