---

yaml --- r: 157916 b: refs/heads/master c: b8e1c73 h: refs/heads/master v: v3
git-mirror · Jun 17, 2009 · 84711e8 · 84711e8
1 parent 502e1c6
commit 84711e8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -461,15 +461,15 @@ 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;
 	/* USB descriptions contain the dB scale in 1/256 dB unit
 	 * 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;