ALSA: usb: Fix a typo in Tascam US-16x08 mixer element
PATCH 1/2 ALSA: usb: Fix a typo in Tascam US-16x08 mixer element
A mixer element created in a quirk for Tascam US-16x08 contains a
typo: it should be "EQ MidLow Q" instead of "EQ MidQLow Q".
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=195875
Fixes d2bb390a2081 ("ALSA: usb-audio: Tascam US-16x08 DSP mixer quirk")
Cc <[email protected]> # v4.11+
Signed-off-by Takashi Iwai <[email protected]>
--- sound/usb/mixer_us16x08.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/usb/mixer_us16x08.c +1 -1
@@ -1135,7 +1135,7 @@ static const struct snd_us16x08_control_params eq_controls[] = { .control_id = SND_US16X08_ID_EQLOWMIDWIDTH, .type = USB_MIXER_U8, .num_channels = 16, - .name = "EQ MidQLow Q", + .name = "EQ MidLow Q", }, {/* EQ mid high gain */ .kcontrol_new = &snd_us16x08_eq_gain_ctl,
Signature · 1 line
2.13.0
PATCH 2/2 ALSA: usb: Avoid VLA in mixer_us16x08.c
This is another attempt to work around the VLA used in mixer_us16x08.c. Basically the temporary array is used individually for two cases, and we can declare locally in each block, instead of hackish max() usage.
Signed-off-by Takashi Iwai <[email protected]>
--- sound/usb/mixer_us16x08.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
sound/usb/mixer_us16x08.c +8 -3
@@ -698,16 +698,18 @@ static int snd_us16x08_meter_get(struct snd_kcontrol *kcontrol,struct snd_usb_audio *chip = elem->head.mixer->chip;struct snd_us16x08_meter_store *store = elem->private_data;u8 meter_urb[64 ]; -char tmp[max (sizeof (mix_init_msg1),sizeof (mix_init_msg2))];switch (kcontrol->private_value) { -case 0 : +case 0 : { +char tmp[sizeof (mix_init_msg1)]; +memcpy (tmp, mix_init_msg1,sizeof (mix_init_msg1));snd_us16x08_send_urb (chip, tmp,4 );snd_us16x08_recv_urb (chip, meter_urb,sizeof (meter_urb)); kcontrol->private_value++;break ; + }case 1 :snd_us16x08_recv_urb (chip, meter_urb,sizeof (meter_urb));
@@ -718,7 +720,9 @@ static int snd_us16x08_meter_get(struct snd_kcontrol *kcontrol, sizeof(meter_urb)); kcontrol->private_value++;break ; -case 3 : +case 3 : { +char tmp[sizeof (mix_init_msg2)]; +memcpy (tmp, mix_init_msg2,sizeof (mix_init_msg2)); tmp[2 ] =snd_get_meter_comp_index (store);snd_us16x08_send_urb (chip, tmp,10 );
@@ -727,6 +731,7 @@ static int snd_us16x08_meter_get(struct snd_kcontrol *kcontrol, kcontrol->private_value =0 ;break ; } + }for (set =0 ; set <6 ; set++)get_meter_levels_from_urb (set, store, meter_urb);
Signature · 1 line
2.13.0