| From 3ee845acba58549578d03a46ed307c0a56c7f777 Mon Sep 17 00:00:00 2001 |
| From: Mark Brown <broonie@opensource.wolfsonmicro.com> |
| Date: Tue, 1 Mar 2011 20:05:23 +0000 |
| Subject: ASoC: Fix WM9081 platform data initialisation |
| |
| From: Mark Brown <broonie@opensource.wolfsonmicro.com> |
| |
| 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 | 5 +++++ |
| 1 file changed, 5 insertions(+) |
| |
| --- 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(st |
| 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) |
