diff options
| author | Russell King - ARM Linux <linux@arm.linux.org.uk> | 2009-04-18 05:11:53 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-18 05:45:10 -0400 |
| commit | 516ef69f160fb2f092d71f2cb635a9394ff8a71a (patch) | |
| tree | 451565c67914cd45180a6fe48deaf5cec093f6c3 /sound/soc | |
| parent | b08f7a62cafd7998862072a1c353219e3d84bbef (diff) | |
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/soc')
| -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) | |||
| 318 | } | 318 | } |
| 319 | 319 | ||
| 320 | #ifdef CONFIG_PM | 320 | #ifdef CONFIG_PM |
| 321 | static int wm9705_soc_suspend(struct platform_device *pdev) | 321 | static int wm9705_soc_suspend(struct platform_device *pdev, pm_message_t msg) |
| 322 | { | 322 | { |
| 323 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); | 323 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); |
| 324 | struct snd_soc_codec *codec = socdev->card->codec; | 324 | struct snd_soc_codec *codec = socdev->card->codec; |