From 84711e88294635643556583c7428a62d3d2ca024 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 16 Jun 2009 14:04:37 +0200 Subject: [PATCH] --- yaml --- r: 157916 b: refs/heads/master c: b8e1c73f4608b8b9ca1e8f1a09f9fd8684e78071 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/usb/usbmixer.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fa498ba944b8..b3872b2cc020 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 085f30654175a91c28d2b66b9ea6cceab627fed0 +refs/heads/master: b8e1c73f4608b8b9ca1e8f1a09f9fd8684e78071 diff --git a/trunk/sound/usb/usbmixer.c b/trunk/sound/usb/usbmixer.c index ecb58e7a6245..f127bfd97c07 100644 --- a/trunk/sound/usb/usbmixer.c +++ b/trunk/sound/usb/usbmixer.c @@ -461,7 +461,7 @@ static int mixer_vol_tlv(struct snd_kcontrol *kcontrol, int op_flag, unsigned int size, unsigned int __user *_tlv) { struct usb_mixer_elem_info *cval = kcontrol->private_data; - DECLARE_TLV_DB_SCALE(scale, 0, 0, 0); + DECLARE_TLV_DB_MINMAX(scale, 0, 0); if (size < sizeof(scale)) return -ENOMEM; @@ -469,7 +469,7 @@ static int mixer_vol_tlv(struct snd_kcontrol *kcontrol, int op_flag, * while ALSA TLV contains in 1/100 dB unit */ scale[2] = (convert_signed_value(cval, cval->min) * 100) / 256; - scale[3] = (convert_signed_value(cval, cval->res) * 100) / 256; + scale[3] = (convert_signed_value(cval, cval->max) * 100) / 256; if (copy_to_user(_tlv, scale, sizeof(scale))) return -EFAULT; return 0;