|
@@ -347,17 +347,20 @@ static int get_ctl_value_v2(struct usb_mixer_elem_info *cval, int request,
|
|
|
int validx, int *value_ret)
|
|
|
{
|
|
|
struct snd_usb_audio *chip = cval->head.mixer->chip;
|
|
|
- unsigned char buf[4 + 3 * sizeof(__u32)]; /* enough space for one range */
|
|
|
+ /* enough space for one range */
|
|
|
+ unsigned char buf[sizeof(__u16) + 3 * sizeof(__u32)];
|
|
|
unsigned char *val;
|
|
|
- int idx = 0, ret, size;
|
|
|
+ int idx = 0, ret, val_size, size;
|
|
|
__u8 bRequest;
|
|
|
|
|
|
+ val_size = uac2_ctl_value_size(cval->val_type);
|
|
|
+
|
|
|
if (request == UAC_GET_CUR) {
|
|
|
bRequest = UAC2_CS_CUR;
|
|
|
- size = uac2_ctl_value_size(cval->val_type);
|
|
|
+ size = val_size;
|
|
|
} else {
|
|
|
bRequest = UAC2_CS_RANGE;
|
|
|
- size = sizeof(buf);
|
|
|
+ size = sizeof(__u16) + 3 * val_size;
|
|
|
}
|
|
|
|
|
|
memset(buf, 0, sizeof(buf));
|
|
@@ -390,16 +393,17 @@ error:
|
|
|
val = buf + sizeof(__u16);
|
|
|
break;
|
|
|
case UAC_GET_MAX:
|
|
|
- val = buf + sizeof(__u16) * 2;
|
|
|
+ val = buf + sizeof(__u16) + val_size;
|
|
|
break;
|
|
|
case UAC_GET_RES:
|
|
|
- val = buf + sizeof(__u16) * 3;
|
|
|
+ val = buf + sizeof(__u16) + val_size * 2;
|
|
|
break;
|
|
|
default:
|
|
|
return -EINVAL;
|
|
|
}
|
|
|
|
|
|
- *value_ret = convert_signed_value(cval, snd_usb_combine_bytes(val, sizeof(__u16)));
|
|
|
+ *value_ret = convert_signed_value(cval,
|
|
|
+ snd_usb_combine_bytes(val, val_size));
|
|
|
|
|
|
return 0;
|
|
|
}
|