All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ASoC: omap: Fix build errors in ams-delta
@ 2011-08-18 12:02 Jarkko Nikula
  2011-08-18 13:20 ` Liam Girdwood
  2011-08-18 16:20 ` Mark Brown
  0 siblings, 2 replies; 3+ messages in thread
From: Jarkko Nikula @ 2011-08-18 12:02 UTC (permalink / raw)
  To: alsa-devel; +Cc: Mark Brown, Liam Girdwood, Jarkko Nikula, Janusz Krzysztofik

Fix "error: too few arguments to function 'ams_delta_set_bias_level'"
build errors in ams-delta.c that were introduced after commit d4c6005 ("ASoC:
Add context parameter to card DAPM callbacks") by adding dapm context
to ams_delta_set_bias_level calls.

Signed-off-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Cc: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
---
 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 30fe0d0..0aa475f 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);
-- 
1.7.5.4

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] ASoC: omap: Fix build errors in ams-delta
  2011-08-18 12:02 [PATCH] ASoC: omap: Fix build errors in ams-delta Jarkko Nikula
@ 2011-08-18 13:20 ` Liam Girdwood
  2011-08-18 16:20 ` Mark Brown
  1 sibling, 0 replies; 3+ messages in thread
From: Liam Girdwood @ 2011-08-18 13:20 UTC (permalink / raw)
  To: Mark Brown; +Cc: alsa-devel@alsa-project.org, Jarkko Nikula, Janusz Krzysztofik

On 18/08/11 13:02, Jarkko Nikula wrote:
> Fix "error: too few arguments to function 'ams_delta_set_bias_level'"
> build errors in ams-delta.c that were introduced after commit d4c6005 ("ASoC:
> Add context parameter to card DAPM callbacks") by adding dapm context
> to ams_delta_set_bias_level calls.
> 
> Signed-off-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
> Cc: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>

Acked-by: Liam Girdwood <lrg@ti.com>

Mark, can you take this since my broadband is still broken.

Thanks

Liam

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] ASoC: omap: Fix build errors in ams-delta
  2011-08-18 12:02 [PATCH] ASoC: omap: Fix build errors in ams-delta Jarkko Nikula
  2011-08-18 13:20 ` Liam Girdwood
@ 2011-08-18 16:20 ` Mark Brown
  1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2011-08-18 16:20 UTC (permalink / raw)
  To: Jarkko Nikula; +Cc: alsa-devel, Liam Girdwood, Janusz Krzysztofik

On Thu, Aug 18, 2011 at 03:02:47PM +0300, Jarkko Nikula wrote:
> Fix "error: too few arguments to function 'ams_delta_set_bias_level'"
> build errors in ams-delta.c that were introduced after commit d4c6005 ("ASoC:
> Add context parameter to card DAPM callbacks") by adding dapm context
> to ams_delta_set_bias_level calls.

Applied, thanks.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2011-08-18 16:21 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-18 12:02 [PATCH] ASoC: omap: Fix build errors in ams-delta Jarkko Nikula
2011-08-18 13:20 ` Liam Girdwood
2011-08-18 16:20 ` Mark Brown

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.