From: Russell King - ARM Linux Date: Sat, 18 Apr 2009 09:11:53 +0000 (+0100) Subject: ASoC: Fix warning in wm9705 X-Git-Tag: v2.6.30-rc6~7^2~2^2~10 X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=516ef69f160fb2f092d71f2cb635a9394ff8a71a;p=safe%2Fjmp%2Flinux-2.6 ASoC: Fix warning in wm9705 I notice that the fixes were merged, minus one: sound/soc/codecs/wm9705.c: At top level: sound/soc/codecs/wm9705.c:445: warning: initialization from incompatible pointer type so you might find this trivial patch useful. Signed-off-by: Russell King Signed-off-by: Mark Brown --- diff --git a/sound/soc/codecs/wm9705.c b/sound/soc/codecs/wm9705.c index 6e23a81..c2d1a7a 100644 --- a/sound/soc/codecs/wm9705.c +++ b/sound/soc/codecs/wm9705.c @@ -318,7 +318,7 @@ static int wm9705_reset(struct snd_soc_codec *codec) } #ifdef CONFIG_PM -static int wm9705_soc_suspend(struct platform_device *pdev) +static int wm9705_soc_suspend(struct platform_device *pdev, pm_message_t msg) { struct snd_soc_device *socdev = platform_get_drvdata(pdev); struct snd_soc_codec *codec = socdev->card->codec;