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

Commit c08d9169 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: tlv - Define numbers in sound/tlv.h 



Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent de8c85f7

include/sound/tlv.h

+3 −1
Original line number Diff line number Diff line
@@ -38,9 +38,11 @@ 
#define SNDRV_CTL_TLVT_DB_MINMAX 4	/* dB scale with min/max */

#define SNDRV_CTL_TLVT_DB_MINMAX_MUTE 5	/* dB scale with min/max with mute */



#define TLV_DB_SCALE_MASK	0xffff

#define TLV_DB_SCALE_MUTE	0x10000

#define TLV_DB_SCALE_ITEM(min, step, mute)			\

	SNDRV_CTL_TLVT_DB_SCALE, 2 * sizeof(unsigned int),	\

	(min), ((step) & 0xffff) | ((mute) ? 0x10000 : 0)

	(min), ((step) & TLV_DB_SCALE_MASK) | ((mute) ? TLV_DB_SCALE_MUTE : 0)

#define DECLARE_TLV_DB_SCALE(name, min, step, mute) \

	unsigned int name[] = { TLV_DB_SCALE_ITEM(min, step, mute) }

sound/pci/hda/hda_codec.c

+1 −1
Original line number Diff line number Diff line
@@ -1843,7 +1843,7 @@ int snd_hda_mixer_amp_tlv(struct snd_kcontrol *kcontrol, int op_flag, 
	val1 += ofs;

	val1 = ((int)val1) * ((int)val2);

	if (min_mute)

		val2 |= 0x10000;

		val2 |= TLV_DB_SCALE_MUTE;

	if (put_user(SNDRV_CTL_TLVT_DB_SCALE, _tlv))

		return -EFAULT;

	if (put_user(2 * sizeof(unsigned int), _tlv + 1))