diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-19 01:20:36 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-19 01:20:36 +0900 |
| commit | 3f612933021ca6cc0edc2722f5a829d3c5b0a6b5 (patch) | |
| tree | 8f64dc339440f72422307c17ac26596a554bc8fc /sound/soc | |
| parent | 3d3106433e779cd6d5e4814eaeaec6b79a8ddd53 (diff) | |
| parent | e574044acbad7421879270a80acd337459c94cc8 (diff) | |
Merge branch 'for-3.1' into for-3.2
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/omap/ams-delta.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c index 30fe0d0efe1..0aa475f92ef 100644 --- a/sound/soc/omap/ams-delta.c +++ b/sound/soc/omap/ams-delta.c @@ -514,7 +514,7 @@ static int ams_delta_cx20442_init(struct snd_soc_pcm_runtime *rtd) } /* Set codec bias level */ - ams_delta_set_bias_level(card, SND_SOC_BIAS_STANDBY); + ams_delta_set_bias_level(card, dapm, SND_SOC_BIAS_STANDBY); /* Add hook switch - can be used to control the codec from userspace * even if line discipline fails */ @@ -649,7 +649,9 @@ static void __exit ams_delta_module_exit(void) ams_delta_hook_switch_gpios); /* Keep modem power on */ - ams_delta_set_bias_level(&ams_delta_audio_card, SND_SOC_BIAS_STANDBY); + ams_delta_set_bias_level(&ams_delta_audio_card, + &ams_delta_audio_card.rtd[0].codec->dapm, + SND_SOC_BIAS_STANDBY); platform_device_unregister(cx20442_platform_device); platform_device_unregister(ams_delta_audio_platform_device); |