diff options
| author |   Russell King - ARM Linux <linux@arm.linux.org.uk> | 2009-04-18 10:11:53 +0100 |
|---|---|---|
| committer |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-18 10:45:10 +0100 |
| commit | 516ef69f160fb2f092d71f2cb635a9394ff8a71a (patch) | |
| tree | 451565c67914cd45180a6fe48deaf5cec093f6c3 /sound | |
| parent | ASoC: OMAP: Update contact addresses (diff) | |
| download | linux-dev-516ef69f160fb2f092d71f2cb635a9394ff8a71a.tar.xz linux-dev-516ef69f160fb2f092d71f2cb635a9394ff8a71a.zip | |
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 <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm9705.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm9705.c b/sound/soc/codecs/wm9705.c index 6e23a81dba78..c2d1a7a18fa3 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; |