diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-03-01 20:05:23 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-03-01 23:10:41 +0000 |
| commit | 3ee845acba58549578d03a46ed307c0a56c7f777 (patch) | |
| tree | c1f37a159519babb97942e7eabd519b3ec03a764 /sound | |
| parent | 43c63188821dc21b2af23a40a18faea6e386e90a (diff) | |
| download | kernel-common-3ee845acba58549578d03a46ed307c0a56c7f777.tar.gz kernel-common-3ee845acba58549578d03a46ed307c0a56c7f777.tar.bz2 kernel-common-3ee845acba58549578d03a46ed307c0a56c7f777.zip | |
ASoC: Fix WM9081 platform data initialisation
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>
Cc: stable@kernel.org
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm9081.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c index 43825b2102a5..cce704c275c6 100644 --- 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> @@ -1341,6 +1342,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) |