summaryrefslogtreecommitdiff
path: root/sound/usb/usbmixer.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-06-16 14:04:37 +0200
committerTakashi Iwai <tiwai@suse.de>2009-06-17 10:57:01 +0200
commitb8e1c73f4608b8b9ca1e8f1a09f9fd8684e78071 (patch)
tree7619d3bc51ce9a07a863c5980b6295a569f1b6f1 /sound/usb/usbmixer.c
parent085f30654175a91c28d2b66b9ea6cceab627fed0 (diff)
downloadlinux-3.10-b8e1c73f4608b8b9ca1e8f1a09f9fd8684e78071.tar.gz
linux-3.10-b8e1c73f4608b8b9ca1e8f1a09f9fd8684e78071.tar.bz2
linux-3.10-b8e1c73f4608b8b9ca1e8f1a09f9fd8684e78071.zip
ALSA: usb-audio - Use the new TLV_DB_MINMAX type
Use the new TLV_DB_MINMAX type instead of TLV_DB_SCALE. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/usbmixer.c')
-rw-r--r--sound/usb/usbmixer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c
index ecb58e7a624..f127bfd97c0 100644
--- a/sound/usb/usbmixer.c
+++ b/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;