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

Commit 801e3659 authored by Colin Ian King's avatar Colin Ian King Committed by Mauro Carvalho Chehab
Browse files

media: em28xx: calculate left volume level correctly 



The calculation of the left volume looks suspect, the value of
0x1f - ((val << 8) & 0x1f) is always 0x1f. The debug prior to the
assignment of value[1] prints the left volume setting using the
calculation 0x1f - (val >> 8) & 0x1f which looks correct to me.
Fix the left volume by using the correct expression as used in
the debug.

Detected by CoverityScan, CID#146140 ("Wrong operator used")

Fixes: 850d24a5 ("[media] em28xx-alsa: add mixer support for AC97 volume controls")

Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarHans Verkuil <hansverk@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent bd9f8f75

drivers/media/usb/em28xx/em28xx-audio.c

+1 −1
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ static int em28xx_vol_get(struct snd_kcontrol *kcontrol, 
		val, (int)kcontrol->private_value);



	value->value.integer.value[0] = 0x1f - (val & 0x1f);

	value->value.integer.value[1] = 0x1f - ((val << 8) & 0x1f);

	value->value.integer.value[1] = 0x1f - ((val >> 8) & 0x1f);



	return 0;

}