summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/tas2552.c
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2015-06-04 15:04:15 +0200
committerMark Brown <broonie@kernel.org>2015-06-04 18:49:53 +0200
commit1cf0f44811b754b64283b11ef0e60cb0de07b29c (patch)
tree7ac882b1eddba7a8e09efb9c2f07171ced571bdb /sound/soc/codecs/tas2552.c
parentASoC: tas2552: Fix kernel crash when the codec is loaded but not part of a card (diff)
downloadlinux-1cf0f44811b754b64283b11ef0e60cb0de07b29c.tar.xz
linux-1cf0f44811b754b64283b11ef0e60cb0de07b29c.zip
ASoC: tas2552: Fix kernel crash caused by wrong kcontrol entry
SOC_DAPM_SINGLE("Playback AMP", ..) should not be under kcontrols. It causes kernel crash (NULL pointer) when the mixers are listed. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@kernel.org> Cc: stable@vger.kernel.org
Diffstat (limited to 'sound/soc/codecs/tas2552.c')
-rw-r--r--sound/soc/codecs/tas2552.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/codecs/tas2552.c b/sound/soc/codecs/tas2552.c
index df89947f1032..9954bd4c14f3 100644
--- a/sound/soc/codecs/tas2552.c
+++ b/sound/soc/codecs/tas2552.c
@@ -338,7 +338,6 @@ static DECLARE_TLV_DB_SCALE(dac_tlv, -7, 100, 24);
static const struct snd_kcontrol_new tas2552_snd_controls[] = {
SOC_SINGLE_TLV("Speaker Driver Playback Volume",
TAS2552_PGA_GAIN, 0, 0x1f, 1, dac_tlv),
- SOC_DAPM_SINGLE("Playback AMP", SND_SOC_NOPM, 0, 1, 0),
};
static const struct reg_default tas2552_init_regs[] = {