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/wm8510.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/wm8510.c')
| -rw-r--r-- | sound/soc/codecs/wm8510.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c index 9000b1d19afb..0f7bcb61071a 100644 --- a/sound/soc/codecs/wm8510.c +++ b/sound/soc/codecs/wm8510.c | |||
| @@ -557,7 +557,7 @@ static int wm8510_resume(struct platform_device *pdev) | |||
| 557 | codec->hw_write(codec->control_data, data, 2); | 557 | codec->hw_write(codec->control_data, data, 2); |
| 558 | } | 558 | } |
| 559 | wm8510_set_bias_level(codec, SND_SOC_BIAS_STANDBY); | 559 | wm8510_set_bias_level(codec, SND_SOC_BIAS_STANDBY); |
| 560 | wm8510_set_bias_level(codec, codec->suspend_bias_level); | 560 | |
| 561 | return 0; | 561 | return 0; |
| 562 | } | 562 | } |
| 563 | 563 | ||