From 7cecaeec8c5690613f57a27e2b59ddb3c580d6c0 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Mon, 19 Mar 2012 16:15:43 +0000 Subject: [PATCH] --- yaml --- r: 305556 b: refs/heads/master c: ab92d09d1306c738b751b839d81e867af1039d14 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/cs4270.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 899d67752750..110f74bea25e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 497098beffaa898ea9fa0076e626f055ef5c832e +refs/heads/master: ab92d09d1306c738b751b839d81e867af1039d14 diff --git a/trunk/sound/soc/codecs/cs4270.c b/trunk/sound/soc/codecs/cs4270.c index 1d672f528662..df8fe387a66f 100644 --- a/trunk/sound/soc/codecs/cs4270.c +++ b/trunk/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. */