From 20df8f7354516db796daa9ff6fb1f7607563cbfe Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Fri, 19 Aug 2011 01:20:36 +0900 Subject: [PATCH] --- yaml --- r: 270528 b: refs/heads/master c: 3f612933021ca6cc0edc2722f5a829d3c5b0a6b5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/omap/ams-delta.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8588cf1715e3..e37c5098992b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3d3106433e779cd6d5e4814eaeaec6b79a8ddd53 +refs/heads/master: 3f612933021ca6cc0edc2722f5a829d3c5b0a6b5 diff --git a/trunk/sound/soc/omap/ams-delta.c b/trunk/sound/soc/omap/ams-delta.c index 30fe0d0efe1c..0aa475f92efa 100644 --- a/trunk/sound/soc/omap/ams-delta.c +++ b/trunk/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);