Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 276280
b: refs/heads/master
c: d66b853
h: refs/heads/master
v: v3
  • Loading branch information
Daniel Mack authored and Mark Brown committed Nov 22, 2011
1 parent c8c1549 commit 016b830
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3d94a2a53a3979c30620e3adea10f20bef8267b3
refs/heads/master: d66b8537b30fbaf79e0f467fa6b7e1a2191cba83
10 changes: 1 addition & 9 deletions trunk/sound/soc/codecs/cs4270.c
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -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);
Expand Down

0 comments on commit 016b830

Please sign in to comment.