Commit 1b075e3f authored by Milan plzik's avatar Milan plzik Committed by Jaroslav Kysela
Browse files

[ALSA] soc - Fix power switching support for DAPM_SWITCH widgets 




Signed-off-by: default avatarMilan plzik <milan.plzik@gmail.com>
Signed-off-by: default avatarLiam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent 4ccab3e7

sound/soc/soc-dapm.c

+3 −2
Original line number Diff line number Diff line
@@ -691,7 +691,7 @@ static int dapm_mux_update_power(struct snd_soc_dapm_widget *widget, 
	return 0;

}



/* test and update the power status of a mixer widget */

/* test and update the power status of a mixer or switch widget */

static int dapm_mixer_update_power(struct snd_soc_dapm_widget *widget,

				   struct snd_kcontrol *kcontrol, int reg,

				   int val_mask, int val, int invert)
@@ -699,7 +699,8 @@ static int dapm_mixer_update_power(struct snd_soc_dapm_widget *widget, 
	struct snd_soc_dapm_path *path;

	int found = 0;



	if (widget->id != snd_soc_dapm_mixer)

	if (widget->id != snd_soc_dapm_mixer &&

	    widget->id != snd_soc_dapm_switch)

		return -ENODEV;



	if (!snd_soc_test_bits(widget->codec, reg, val_mask, val))