diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-12-01 16:32:18 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-12-01 16:32:18 +0100 |
| commit | cf54d47c13c2b171f946289de445102c676d4258 (patch) | |
| tree | c7e88f33402257f3e06bc708e58843518d8ca17b /sound/soc/codecs/cs4270.c | |
| parent | 88d686027bb43f585914c77dd363f6e817b42c2a (diff) | |
| parent | bda63586bc5929e97288cdb371bb6456504867ed (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/codecs/cs4270.c')
| -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 f1f237ecec2..73f46eb459f 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); |