Unverified Commit aa726454 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/twl-breakage' into asoc-next

parents ce8ee02d 8146acff

sound/soc/codecs/twl4030.c

+2 −0
Original line number Diff line number Diff line
@@ -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,

sound/soc/codecs/twl6040.c

+2 −0
Original line number Diff line number Diff line
@@ -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,