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

Commit 71d7d83e authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] em28xx-audio: volumes are inverted 



While here, fix volume mask to 5 bits

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 43131a2c

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

+8 −8
Original line number Original line Diff line number Diff line
@@ -452,8 +452,8 @@ static int em28xx_vol_put(struct snd_kcontrol *kcontrol, 
			       struct snd_ctl_elem_value *value)

			       struct snd_ctl_elem_value *value)

{

{

	struct em28xx *dev = snd_kcontrol_chip(kcontrol);

	struct em28xx *dev = snd_kcontrol_chip(kcontrol);

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

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

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

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

	int rc;

	int rc;





	mutex_lock(&dev->lock);

	mutex_lock(&dev->lock);
@@ -482,8 +482,8 @@ static int em28xx_vol_get(struct snd_kcontrol *kcontrol, 
	if (val < 0)

	if (val < 0)

		return val;

		return val;





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

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

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

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





	return 0;

	return 0;

}

}
@@ -501,9 +501,9 @@ static int em28xx_vol_put_mute(struct snd_kcontrol *kcontrol, 
		goto err;

		goto err;





	if (val)

	if (val)

		rc |= 0x8000;

		rc &= 0x1f1f;

	else

	else

		rc &= 0x7f7f;

		rc |= 0x8000;





	rc = em28xx_write_ac97(dev, kcontrol->private_value, rc);

	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;

		return val;





	if (val & 0x8000)

	if (val & 0x8000)

		value->value.integer.value[0] = 1;

	else

		value->value.integer.value[0] = 0;

		value->value.integer.value[0] = 0;

	else

		value->value.integer.value[0] = 1;





	return 0;

	return 0;

}

}