Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 162b187e authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-3.2' into for-3.3

parents a290986b 5b895eec

sound/soc/samsung/speyside.c

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ static int speyside_late_probe(struct snd_soc_card *card) 
	snd_soc_dapm_ignore_suspend(&card->dapm, "Headset Mic");

	snd_soc_dapm_ignore_suspend(&card->dapm, "Main AMIC");

	snd_soc_dapm_ignore_suspend(&card->dapm, "Main DMIC");

	snd_soc_dapm_ignore_suspend(&card->dapm, "Speaker");

	snd_soc_dapm_ignore_suspend(&card->dapm, "Main Speaker");

	snd_soc_dapm_ignore_suspend(&card->dapm, "WM1250 Output");

	snd_soc_dapm_ignore_suspend(&card->dapm, "WM1250 Input");