diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-08-19 08:30:38 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-08-19 08:30:38 +0200 |
commit | b55ac2a116e2b0bb2293873c290751cc17099022 (patch) | |
tree | 947b3a104e782eb08da6388cb137845be4481161 /sound/usb/mixer.c | |
parent | d877681d2eab28ae2a7ff08bec9a6fe3b65973fb (diff) | |
parent | 38b65190c6ab0be8ce7cff69e734ca5b5e7fa309 (diff) | |
download | op-kernel-dev-b55ac2a116e2b0bb2293873c290751cc17099022.zip op-kernel-dev-b55ac2a116e2b0bb2293873c290751cc17099022.tar.gz |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/usb/mixer.c')
-rw-r--r-- | sound/usb/mixer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index c04d7c7..cdd19d7 100644 --- a/sound/usb/mixer.c +++ b/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 | |