Re: Merged upstream to topic/asoc branch

[Takashi Iwai <tiwai@suse.de>]

At Mon, 1 Dec 2008 17:42:52 +0000,
Mark Brown wrote:
> 
> On Mon, Dec 01, 2008 at 06:37:17PM +0100, Takashi Iwai wrote:
> 
> > Oh, BTW, the following fix is also still pending on my local queue.
> 
> That fix looks good, I don't regularly track the Zaurii since keeping
> track of the build failures in mainline was more trouble than it was
> worth last time I tried.
> 
> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

OK.  I also applied one more fix below.


Takashi

===
>From 682d5874f3d654b5d13d9b8dd56b9e05cfadd01b Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 1 Dec 2008 20:03:54 +0100
Subject: [PATCH] ALSA: ASoC: Fix old-style trigger callback in s3c2443-ac97.c

Fix the old-style trigger callback in s3c2443-ac97.c:
    sound/soc/s3c24xx/s3c2443-ac97.c:378: warning: initialization from incompatible pointer type

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/soc/s3c24xx/s3c2443-ac97.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/sound/soc/s3c24xx/s3c2443-ac97.c b/sound/soc/s3c24xx/s3c2443-ac97.c
index 41bde6a..f0bc9b7 100644
--- a/sound/soc/s3c24xx/s3c2443-ac97.c
+++ b/sound/soc/s3c24xx/s3c2443-ac97.c
@@ -285,7 +285,8 @@ static int s3c2443_ac97_hw_params(struct snd_pcm_substream *substream,
 	return 0;
 }
 
-static int s3c2443_ac97_trigger(struct snd_pcm_substream *substream, int cmd)
+static int s3c2443_ac97_trigger(struct snd_pcm_substream *substream, int cmd,
+				struct snd_soc_dai *dai)
 {
 	u32 ac_glbctrl;
 
-- 
1.6.0.4