commit d6d264c49f744c6e60a6c7309188f62d0c44e0ae
author Linux Build Service Account <lnxbuild@localhost> Mon Dec 12 21:31:04 2011 -0800
committer QuIC Gerrit Code Review <code-review@localhost> Mon Dec 12 21:31:04 2011 -0800
tree 2037b778c07a42a3291f04242e00780fd3636620
parent 645e15d20b53046ced5dd1f5e7c7af6a4bcb2947
parent 76f5703604190e495911dd3a6dad5063d1b5d0b5

Merge "ASoc: msm: Fix equalizer ALSA mixer get handlers" into msm-3.0

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

diff --git a/sound/soc/msm/msm-pcm-routing.c b/sound/soc/msm/msm-pcm-routing.c
index 3573169..b254cd8 100644
--- a/sound/soc/msm/msm-pcm-routing.c
+++ b/sound/soc/msm/msm-pcm-routing.c
@@ -518,9 +518,11 @@
 	int eq_idx = ((struct soc_multi_mixer_control *)
 					kcontrol->private_value)->reg;
 
+	ucontrol->value.integer.value[0] = eq_data[eq_idx].enable;
+
 	pr_debug("%s: EQ #%d enable %d\n", __func__,
 		eq_idx, eq_data[eq_idx].enable);
-	return eq_data[eq_idx].enable;
+	return 0;
 }
 
 static int msm_routing_put_eq_enable_mixer(struct snd_kcontrol *kcontrol,
@@ -545,6 +547,8 @@
 	int eq_idx = ((struct soc_multi_mixer_control *)
 					kcontrol->private_value)->reg;
 
+	ucontrol->value.integer.value[0] = eq_data[eq_idx].num_bands;
+
 	pr_debug("%s: EQ #%d bands %d\n", __func__,
 		eq_idx, eq_data[eq_idx].num_bands);
 	return eq_data[eq_idx].num_bands;
@@ -558,7 +562,6 @@
 					kcontrol->private_value)->reg;
 	int value = ucontrol->value.integer.value[0];
 
-
 	pr_debug("%s: EQ #%d bands %d\n", __func__,
 		eq_idx, value);
 	eq_data[eq_idx].num_bands = value;
@@ -573,6 +576,17 @@
 	int band_idx = ((struct soc_multi_mixer_control *)
 					kcontrol->private_value)->shift;
 
+	ucontrol->value.integer.value[0] =
+			eq_data[eq_idx].eq_bands[band_idx].band_idx;
+	ucontrol->value.integer.value[1] =
+			eq_data[eq_idx].eq_bands[band_idx].filter_type;
+	ucontrol->value.integer.value[2] =
+			eq_data[eq_idx].eq_bands[band_idx].center_freq_hz;
+	ucontrol->value.integer.value[3] =
+			eq_data[eq_idx].eq_bands[band_idx].filter_gain;
+	ucontrol->value.integer.value[4] =
+			eq_data[eq_idx].eq_bands[band_idx].q_factor;
+
 	pr_debug("%s: band_idx = %d\n", __func__,
 			eq_data[eq_idx].eq_bands[band_idx].band_idx);
 	pr_debug("%s: filter_type = %d\n", __func__,