Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[media] em28xx-audio: volumes are inverted

Browse source 
While here, fix volume mask to 5 bits

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab 2011-06-19 13:14:07 -03:00
parent 43131a2ca6
commit 71d7d83edc
1 changed files with 8 additions and 8 deletions

16
drivers/media/video/em28xx/em28xx-audio.c
View file

@ -452,8 +452,8 @@ static int em28xx_vol_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *value)
{
struct em28xx *dev = snd_kcontrol_chip(kcontrol);
u16 val = (value->value.integer.value[0] & 0x1f) |
(value->value.integer.value[1] & 0x1f) << 8;
u16 val = (0x1f - (value->value.integer.value[0] & 0x1f)) |
(0x1f - (value->value.integer.value[1] & 0x1f)) << 8;
int rc;
mutex_lock(&dev->lock);
@ -482,8 +482,8 @@ static int em28xx_vol_get(struct snd_kcontrol *kcontrol,
if (val < 0)
return val;
value->value.integer.value[0] = val & 0x1f;
value->value.integer.value[1] = (val << 8) & 0x1f;
value->value.integer.value[0] = 0x1f - (val & 0x1f);
value->value.integer.value[1] = 0x1f - ((val << 8) & 0x1f);
return 0;
}
@ -501,9 +501,9 @@ static int em28xx_vol_put_mute(struct snd_kcontrol *kcontrol,
goto err;
if (val)
rc |= 0x8000;
rc &= 0x1f1f;
else
rc &= 0x7f7f;
rc |= 0x8000;
rc = em28xx_write_ac97(dev, kcontrol->private_value, rc);
@ -525,9 +525,9 @@ static int em28xx_vol_get_mute(struct snd_kcontrol *kcontrol,
return val;
if (val & 0x8000)
value->value.integer.value[0] = 1;
else
value->value.integer.value[0] = 0;
else
value->value.integer.value[0] = 1;
return 0;
}