diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-05-20 06:00:43 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-05-20 06:00:43 -0400 |
| commit | d71f4cece4bd97d05592836202fc04ff2e7817e3 (patch) | |
| tree | 6c877c7a938758b1323d9c97d46b9c536e618c69 /sound/soc/codecs/wm8728.c | |
| parent | 19008bdacb9f7841166ebafe0aef361ee582ffbf (diff) | |
| parent | ad8332c1302bcb4f80d593fd3eb477be9d7f5604 (diff) | |
Merge branch 'topic/asoc' into for-linus
Conflicts:
sound/soc/codecs/ad1938.c
Diffstat (limited to 'sound/soc/codecs/wm8728.c')
| -rw-r--r-- | sound/soc/codecs/wm8728.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8728.c b/sound/soc/codecs/wm8728.c index 07adc375a706..34be2d2b69ef 100644 --- a/sound/soc/codecs/wm8728.c +++ b/sound/soc/codecs/wm8728.c | |||
| @@ -238,7 +238,7 @@ static int wm8728_resume(struct platform_device *pdev) | |||
| 238 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); | 238 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); |
| 239 | struct snd_soc_codec *codec = socdev->card->codec; | 239 | struct snd_soc_codec *codec = socdev->card->codec; |
| 240 | 240 | ||
| 241 | wm8728_set_bias_level(codec, codec->suspend_bias_level); | 241 | wm8728_set_bias_level(codec, SND_SOC_BIAS_STANDBY); |
| 242 | 242 | ||
| 243 | return 0; | 243 | return 0; |
| 244 | } | 244 | } |