diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-03-01 23:29:04 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-03-01 23:29:04 +0000 |
| commit | c496ccd5dbd8bd25a8817bc2a901adec153a41e1 (patch) | |
| tree | a8881fbe1b6ee31ba6e937367775a98aacf401dc /sound/soc/codecs/wm9081.c | |
| parent | e1412e636eeb84023b79e525909b366a9b28a185 (diff) | |
| parent | 04d286819ba499839d04cbf847f2ea28d5cf4296 (diff) | |
| download | lwn-c496ccd5dbd8bd25a8817bc2a901adec153a41e1.tar.gz lwn-c496ccd5dbd8bd25a8817bc2a901adec153a41e1.zip | |
Merge branch 'for-2.6.38' into for-2.6.39
Diffstat (limited to 'sound/soc/codecs/wm9081.c')
| -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 b62e98942cf8..2103623a0776 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) |