diff options
| author | Mark Brown <broonie@kernel.org> | 2018-02-07 11:23:48 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-02-07 11:23:48 +0000 |
| commit | aa726454817dc68c4ee28f06d29397a312718edf (patch) | |
| tree | 3a1c5e56b8643014a98c60ecf4600b01849a9258 /sound/soc | |
| parent | ce8ee02d519ab20c5b87d3b3929b5e44ad89e26f (diff) | |
| parent | 8146acff3b80327f2a23710f2674a79a7fa80de3 (diff) | |
| download | talos-obmc-linux-aa726454817dc68c4ee28f06d29397a312718edf.tar.gz talos-obmc-linux-aa726454817dc68c4ee28f06d29397a312718edf.zip | |
Merge remote-tracking branch 'asoc/fix/twl-breakage' into asoc-next
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/twl4030.c | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/twl6040.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index 8798182959c1..e4d7f397d361 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c @@ -2195,6 +2195,8 @@ static int twl4030_soc_remove(struct snd_soc_codec *codec) static const struct snd_soc_codec_driver soc_codec_dev_twl4030 = { .probe = twl4030_soc_probe, .remove = twl4030_soc_remove, + .read = twl4030_read, + .write = twl4030_write, .set_bias_level = twl4030_set_bias_level, .idle_bias_off = true, diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c index 3b895b4b451c..573a523ed0b3 100644 --- a/sound/soc/codecs/twl6040.c +++ b/sound/soc/codecs/twl6040.c @@ -1158,6 +1158,8 @@ static int twl6040_remove(struct snd_soc_codec *codec) static const struct snd_soc_codec_driver soc_codec_dev_twl6040 = { .probe = twl6040_probe, .remove = twl6040_remove, + .read = twl6040_read, + .write = twl6040_write, .set_bias_level = twl6040_set_bias_level, .suspend_bias_off = true, .ignore_pmdown_time = true, |
