Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4581aa36fc8273579f6b7979adc4f4e666460a8d

Authored by Takashi Iwai
Committed by Jaroslav Kysela
1 parent dec44dbe01
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[ALSA] dbri - Fix broken change for value range checks 

The last patch for value range checks included a broken merge result.
Now fixed properly.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

Showing 1 changed file with 4 additions and 4 deletions Side-by-side Diff

... ... @@ -2292,12 +2292,12 @@
2292 2292 return -EINVAL;
2293 2293 }
2294 2294  
2295   - if (info->left_gain !=
2296   - info->left_gain = ucontrol->value.integer.value[0];
  2295 + if (info->left_gain != vol[0]) {
  2296 + info->left_gain = vol[0];
2297 2297 changed = 1;
2298 2298 }
2299   - if (info->right_gain != ucontrol->value.integer.value[1]) {
2300   - info->right_gain = ucontrol->value.integer.value[1];
  2299 + if (info->right_gain != vol[1]) {
  2300 + info->right_gain = vol[1];
2301 2301 changed = 1;
2302 2302 }
2303 2303 if (changed) {