diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-03-31 10:16:31 (GMT) |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-03-31 10:16:31 (GMT) |
commit | 9ddd84f872898373c51469f9c931d5aa89fdc807 (patch) | |
tree | d81f9e396801f04d55924c0d3bbd903fe60ebcda /sound/soc/codecs/max9768.c | |
parent | 749d32237bf39e6576dd95bfdf24e4378e51716c (diff) | |
parent | a4b7f21d7b42b33609df3f86992a8deff80abfaf (diff) | |
download | linux-9ddd84f872898373c51469f9c931d5aa89fdc807.tar.xz |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/soc/codecs/max9768.c')
-rw-r--r-- | sound/soc/codecs/max9768.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sound/soc/codecs/max9768.c b/sound/soc/codecs/max9768.c index 31f9156..ec481fc 100644 --- a/sound/soc/codecs/max9768.c +++ b/sound/soc/codecs/max9768.c @@ -135,11 +135,6 @@ static int max9768_probe(struct snd_soc_codec *codec) struct max9768 *max9768 = snd_soc_codec_get_drvdata(codec); int ret; - codec->control_data = max9768->regmap; - ret = snd_soc_codec_set_cache_io(codec, 2, 6, SND_SOC_REGMAP); - if (ret) - return ret; - if (max9768->flags & MAX9768_FLAG_CLASSIC_PWM) { ret = snd_soc_write(codec, MAX9768_CTRL, MAX9768_CTRL_PWM); if (ret) |