projects
/
unionfs-2.6.39.y.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4a160e5
)
ASoC: Fix WM9081 platform data initialisation
author
Mark Brown
<broonie@opensource.wolfsonmicro.com>
Tue, 1 Mar 2011 20:05:23 +0000
(20:05 +0000)
committer
Greg Kroah-Hartman
<gregkh@suse.de>
Mon, 14 Mar 2011 21:17:32 +0000
(14:17 -0700)
commit
3ee845acba58549578d03a46ed307c0a56c7f777
upstream.
It went AWOL in the multi-component conversion.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
sound/soc/codecs/wm9081.c
patch
|
blob
|
history
diff --git
a/sound/soc/codecs/wm9081.c
b/sound/soc/codecs/wm9081.c
index a486670966bd7e6a44470ece6918fab24c638c2b..1dce6d13f3b9b21e4aef4d25ace65d1dc1c3d6ca 100644
(file)
--- a/
sound/soc/codecs/wm9081.c
+++ b/
sound/soc/codecs/wm9081.c
@@
-15,6
+15,7
@@
#include <linux/moduleparam.h>
#include <linux/init.h>
#include <linux/delay.h>
+#include <linux/device.h>
#include <linux/pm.h>
#include <linux/i2c.h>
#include <linux/platform_device.h>
@@
-1338,6
+1339,10
@@
static __devinit int wm9081_i2c_probe(struct i2c_client *i2c,
wm9081->control_type = SND_SOC_I2C;
wm9081->control_data = i2c;
+ if (dev_get_platdata(&i2c->dev))
+ memcpy(&wm9081->retune, dev_get_platdata(&i2c->dev),
+ sizeof(wm9081->retune));
+
ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_wm9081, &wm9081_dai, 1);
if (ret < 0)