aboutsummaryrefslogtreecommitdiffstats
path: root/sound/core
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-09-10 15:33:06 +0200
committerTakashi Iwai <tiwai@suse.de>2009-09-10 15:33:06 +0200
commitb34c8663940dfc7da767c42b37605e5ad3ae11f7 (patch)
tree3e6639dd10ec737651871649c14fff9798511afa /sound/core
parent3827119e207823ff0f3e85271bef7a0dc953ee38 (diff)
parenteedbdf03a25ab3b2c332ad7fa205aa8ffbe477ba (diff)
downloadkernel_samsung_aries-b34c8663940dfc7da767c42b37605e5ad3ae11f7.zip
kernel_samsung_aries-b34c8663940dfc7da767c42b37605e5ad3ae11f7.tar.gz
kernel_samsung_aries-b34c8663940dfc7da767c42b37605e5ad3ae11f7.tar.bz2
Merge branch 'topic/tlv-minmax' into for-linus
* topic/tlv-minmax: ALSA: usb-audio - Correct bogus volume dB information ALSA: usb-audio - Use the new TLV_DB_MINMAX type ALSA: Add new TLV types for dBwith min/max
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/vmaster.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/sound/core/vmaster.c b/sound/core/vmaster.c
index 257624b..3b9b550 100644
--- a/sound/core/vmaster.c
+++ b/sound/core/vmaster.c
@@ -353,7 +353,8 @@ static void master_free(struct snd_kcontrol *kcontrol)
*
* The optional argument @tlv can be used to specify the TLV information
* for dB scale of the master control. It should be a single element
- * with #SNDRV_CTL_TLVT_DB_SCALE type, and should be the max 0dB.
+ * with #SNDRV_CTL_TLVT_DB_SCALE, #SNDRV_CTL_TLV_DB_MINMAX or
+ * #SNDRV_CTL_TLVT_DB_MINMAX_MUTE type, and should be the max 0dB.
*/
struct snd_kcontrol *snd_ctl_make_virtual_master(char *name,
const unsigned int *tlv)
@@ -384,7 +385,10 @@ struct snd_kcontrol *snd_ctl_make_virtual_master(char *name,
kctl->private_free = master_free;
/* additional (constant) TLV read */
- if (tlv && tlv[0] == SNDRV_CTL_TLVT_DB_SCALE) {
+ if (tlv &&
+ (tlv[0] == SNDRV_CTL_TLVT_DB_SCALE ||
+ tlv[0] == SNDRV_CTL_TLVT_DB_MINMAX ||
+ tlv[0] == SNDRV_CTL_TLVT_DB_MINMAX_MUTE)) {
kctl->vd[0].access |= SNDRV_CTL_ELEM_ACCESS_TLV_READ;
memcpy(master->tlv, tlv, sizeof(master->tlv));
kctl->tlv.p = master->tlv;