summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTushar Behera <tushar.behera@linaro.org>2011-11-23 10:23:25 +0530
committerTushar Behera <tushar.behera@linaro.org>2011-11-24 13:36:47 +0530
commit81257b3c36060702c189de2963aaac03735fec50 (patch)
treea3ed54b5683b1503c543d25bcaf177c115ee5002
parent3db920674867c58e7ebed52884f9d860fafa9d0a (diff)
ASoC: codecs: rt5625: Change control_type to SND_SOC_REGMAPsamsung-lt-v3.2-rc3
With recent changes to snd_soc_codec_set_cache_io, control_data is reassigned when the control type is set as SND_SOC_I2C. In order to retain the control data as obtained through i2c_client_probe, the control_type needs to be set as SND_SOC_REGMAP. Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
-rw-r--r--sound/soc/codecs/rt5625.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/rt5625.c b/sound/soc/codecs/rt5625.c
index 81f263a3dcd3..70f908e394bf 100644
--- a/sound/soc/codecs/rt5625.c
+++ b/sound/soc/codecs/rt5625.c
@@ -1876,7 +1876,7 @@ static __devinit int rt5625_i2c_probe(struct i2c_client *i2c,
i2c_set_clientdata(i2c, rt5625);
rt5625->control_data = i2c;
- rt5625->control_type = SND_SOC_I2C;
+ rt5625->control_type = SND_SOC_REGMAP;
ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5625,
rt5625_dai, ARRAY_SIZE(rt5625_dai));