diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-13 10:19:21 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-13 10:19:21 -0400 |
| commit | 2620954d64f6f067b785faf03738b637f3473ca7 (patch) | |
| tree | 00c5281e4acabc56ac1cd215a63963d956b09879 /sound/soc/codecs/88pm860x-codec.c | |
| parent | 8b3272bffe58682de568e36f9db52495f9b9d0f2 (diff) | |
| parent | a32c17b87c17f5e2e68edcf4d163ee42f9490652 (diff) | |
Merge remote-tracking branch 'asoc/topic/io' into asoc-next
Diffstat (limited to 'sound/soc/codecs/88pm860x-codec.c')
| -rw-r--r-- | sound/soc/codecs/88pm860x-codec.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/codecs/88pm860x-codec.c b/sound/soc/codecs/88pm860x-codec.c index 8703244ee9fb..b07e17160f94 100644 --- a/sound/soc/codecs/88pm860x-codec.c +++ b/sound/soc/codecs/88pm860x-codec.c | |||
| @@ -1327,8 +1327,7 @@ static int pm860x_probe(struct snd_soc_codec *codec) | |||
| 1327 | 1327 | ||
| 1328 | pm860x->codec = codec; | 1328 | pm860x->codec = codec; |
| 1329 | 1329 | ||
| 1330 | codec->control_data = pm860x->regmap; | 1330 | ret = snd_soc_codec_set_cache_io(codec, pm860x->regmap); |
| 1331 | ret = snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP); | ||
| 1332 | if (ret) | 1331 | if (ret) |
| 1333 | return ret; | 1332 | return ret; |
| 1334 | 1333 | ||