From: Mark Brown Date: Mon, 19 Mar 2012 16:15:43 +0000 (+0000) Subject: ASoC: cs4270: Check that we can enable regulators on resume X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=ab92d09d1306c738b751b839d81e867af1039d14;p=openwrt%2Fstaging%2Fblogic.git 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 Acked-by: Timur Tabi --- diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c index 1d672f528662..df8fe387a66f 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. */