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

Commit b922b6b8 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm: Use msm_route_ec_ref_rx for widget update"

parents dee42a92 3af13c7b

sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c

+2 −6
Original line number Diff line number Diff line
@@ -2758,14 +2758,9 @@ static int msm_routing_ec_ref_rx_put(struct snd_kcontrol *kcontrol, 
	struct snd_soc_dapm_widget_list *wlist =

					dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	int mux = ucontrol->value.enumerated.item[0];

	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;

	struct snd_soc_dapm_update *update = NULL;













	if (mux >= e->items) {













		pr_err("%s: Invalid mux value %d\n", __func__, mux);













		return -EINVAL;













	}





























	mutex_lock(&routing_lock);















	switch (ucontrol->value.integer.value[0]) {










@@ -2868,7 +2863,8 @@ static int msm_routing_ec_ref_rx_put(struct snd_kcontrol *kcontrol,













	pr_debug("%s: msm_route_ec_ref_rx = %d\n",















	    __func__, msm_route_ec_ref_rx);















	mutex_unlock(&routing_lock);













	snd_soc_dapm_mux_update_power(widget->dapm, kcontrol, mux, e, update);













	snd_soc_dapm_mux_update_power(widget->dapm, kcontrol,













					msm_route_ec_ref_rx, e, update);















	return 0;















}