diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-08-19 07:55:10 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-29 13:29:09 -0700 |
| commit | 5e5c860400ef1307e3d87aebd5ec8a35b078ca51 (patch) | |
| tree | 346e159f3e9d9f2f248c6ca37da918b38377eeba /sound | |
| parent | 966ef7daecee021ffded11d584e57160ee0395c2 (diff) | |
| download | lwn-5e5c860400ef1307e3d87aebd5ec8a35b078ca51.tar.gz lwn-5e5c860400ef1307e3d87aebd5ec8a35b078ca51.zip | |
ALSA: usb-audio - Fix missing mixer dB information
commit 38b65190c6ab0be8ce7cff69e734ca5b5e7fa309 upstream.
The recent fix for testing dB range at the mixer creation time seems
to cause regressions in some devices. In such devices, reading the dB
info at probing time gives an error, thus both dBmin and dBmax are still
zero, and TLV flag isn't set although the later read of dB info succeeds.
This patch adds a workaround for such a case by assuming that the later
read will succeed. In future, a similar test should be performed in a
case where a wrong dB range is seen even in the later read.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'sound')
| -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 c04d7c71ac88..cdd19d7fe500 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 | |