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/tlv320aic23.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/tlv320aic23.c')
| -rw-r--r-- | sound/soc/codecs/tlv320aic23.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c index 776b79cde904..b0bae3508b29 100644 --- a/sound/soc/codecs/tlv320aic23.c +++ b/sound/soc/codecs/tlv320aic23.c | |||
| @@ -634,7 +634,6 @@ static int tlv320aic23_resume(struct platform_device *pdev) | |||
| 634 | } | 634 | } |
| 635 | 635 | ||
| 636 | tlv320aic23_set_bias_level(codec, SND_SOC_BIAS_STANDBY); | 636 | tlv320aic23_set_bias_level(codec, SND_SOC_BIAS_STANDBY); |
| 637 | tlv320aic23_set_bias_level(codec, codec->suspend_bias_level); | ||
| 638 | 637 | ||
| 639 | return 0; | 638 | return 0; |
| 640 | } | 639 | } |