diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-22 23:07:23 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-22 23:07:23 (GMT) |
| commit | 34c3a64a45958b917f88b082c442757992ef7025 (patch) | |
| tree | ae850732daf025fe6987a7f846cfa72ab0a10c97 /sound/soc/codecs | |
| parent | a5cf8060abef9bbc60de356088a5755b7a1f890c (diff) | |
| parent | 380c88303812951f6c838241366a66a03fb5c897 (diff) | |
| download | linux-fsl-qoriq-34c3a64a45958b917f88b082c442757992ef7025.tar.xz | |
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/cs4270.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c index f1f237e..73f46eb 100644 --- a/sound/soc/codecs/cs4270.c +++ b/sound/soc/codecs/cs4270.c @@ -601,7 +601,6 @@ static int cs4270_soc_suspend(struct snd_soc_codec *codec, pm_message_t mesg) static int cs4270_soc_resume(struct snd_soc_codec *codec) { struct cs4270_private *cs4270 = snd_soc_codec_get_drvdata(codec); - struct i2c_client *i2c_client = to_i2c_client(codec->dev); int reg; regulator_bulk_enable(ARRAY_SIZE(cs4270->supplies), @@ -612,14 +611,7 @@ static int cs4270_soc_resume(struct snd_soc_codec *codec) ndelay(500); /* first restore the entire register cache ... */ - for (reg = CS4270_FIRSTREG; reg <= CS4270_LASTREG; reg++) { - u8 val = snd_soc_read(codec, reg); - - if (i2c_smbus_write_byte_data(i2c_client, reg, val)) { - dev_err(codec->dev, "i2c write failed\n"); - return -EIO; - } - } + snd_soc_cache_sync(codec); /* ... then disable the power-down bits */ reg = snd_soc_read(codec, CS4270_PWRCTL); |