Commit 3f612933 authored by Mark Brown's avatar Mark Brown

Merge branch 'for-3.1' into for-3.2

parents 3d310643 e574044a
...@@ -514,7 +514,7 @@ static int ams_delta_cx20442_init(struct snd_soc_pcm_runtime *rtd) ...@@ -514,7 +514,7 @@ static int ams_delta_cx20442_init(struct snd_soc_pcm_runtime *rtd)
} }
/* Set codec bias level */ /* 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 /* Add hook switch - can be used to control the codec from userspace
* even if line discipline fails */ * even if line discipline fails */
...@@ -649,7 +649,9 @@ static void __exit ams_delta_module_exit(void) ...@@ -649,7 +649,9 @@ static void __exit ams_delta_module_exit(void)
ams_delta_hook_switch_gpios); ams_delta_hook_switch_gpios);
/* Keep modem power on */ /* 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(cx20442_platform_device);
platform_device_unregister(ams_delta_audio_platform_device); platform_device_unregister(ams_delta_audio_platform_device);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment