From a0b6aa84714de9e8621fcb478654f7c7e24fbad0 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Fri, 19 Aug 2011 07:55:10 +0200 Subject: [PATCH] --- yaml --- r: 263160 b: refs/heads/master c: 38b65190c6ab0be8ce7cff69e734ca5b5e7fa309 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/usb/mixer.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9967a383be55..8237694013bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3fe45aeaf2033c9eaa5028ed5ba68b466008876f +refs/heads/master: 38b65190c6ab0be8ce7cff69e734ca5b5e7fa309 diff --git a/trunk/sound/usb/mixer.c b/trunk/sound/usb/mixer.c index c04d7c71ac88..cdd19d7fe500 100644 --- a/trunk/sound/usb/mixer.c +++ b/trunk/sound/usb/mixer.c @@ -152,6 +152,7 @@ static inline void check_mapped_dB(const struct usbmix_name_map *p, if (p && p->dB) { cval->dBmin = p->dB->min; cval->dBmax = p->dB->max; + cval->initialized = 1; } } @@ -1092,7 +1093,7 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc, " Switch" : " Volume"); if (control == UAC_FU_VOLUME) { check_mapped_dB(map, cval); - if (cval->dBmin < cval->dBmax) { + if (cval->dBmin < cval->dBmax || !cval->initialized) { kctl->tlv.c = mixer_vol_tlv; kctl->vd[0].access |= SNDRV_CTL_ELEM_ACCESS_TLV_READ |