ALSA: usb-audio: add MAYA44 USB+ mixer control names
A message that is not in the archive (sent off-list or not yet received): CAKfvqMUuD4ywuKktwko4DxgKpX1+vTCYHkngPXxKBjHNnmt_iw@mail.gmail.com
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): CAKfvqMVEWGDUUh4e0i9fEsbhBQyYPuzqs3xAQKA_FuZYtPuigg@mail.gmail.com
A message that is not in the archive (sent off-list or not yet received): CAKfvqMVQHt157QmE5Fx=NV_U0i_JdH6UKtNXfcGaNvJNEW9M4Q@mail.gmail.com
A message that is not in the archive (sent off-list or not yet received): CAKfvqMW9P-_fzx86c=bM_cD0sd93hsnaLuGwWRgKmPpEFLP7Ww@mail.gmail.com
A message that is not in the archive (sent off-list or not yet received): CAKfvqMUJ+JDJoSWL5WjLugMoSN3FFbD0AFTJJ2-nW-dsgjLtdg@mail.gmail.com
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): CAKfvqMUA=CvfEETYWEESWs7xh3GiDgbjXHaAnx0UkpUxpBn_NA@mail.gmail.com
A message that is not in the archive (sent off-list or not yet received): CAKfvqMV0xm0_fGs7=qEmjyE6p4Wf-xO0r3x7BuRbzo15h+pjew@mail.gmail.com
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): CAKfvqMUPGMiukizZqSN5nY_OR3_ur6FF44GVcGmiQWNTMc8-1A@mail.gmail.com
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): CAKfvqMXWFNK3XvK8A9JY5xFnyQqw4C77D61JZb6xOqT92yDpug@mail.gmail.com
A message that is not in the archive (sent off-list or not yet received): CAKfvqMUf7ET5KLAvYXNU2haLyeyBL
[email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): CAKfvqMWBgeJb_sMJdmb0cYcq2qD8UocfEyGY1B-BKERjAXpY7A@mail.gmail.com
PATCH 1/1 ALSA: usb-audio: add MAYA44 USB+ mixer control names
Add mixer control names for the ESI Maya44 USB+ (which appears to be identical width the AudioTrak Maya44 USB).
sound/usb/mixer_maps.c +5 -0
@@ -437,6 +437,11 @@ static struct usbmix_ctl_map usbmix_ctl_ .map = ebox44_map, }, { +/* MAYA44 USB+ */ + .id = USB_ID(0x2573, 0x0008), + .map = maya44_map, + }, + {/* KEF X300A */ .id = USB_ID(0x27ac, 0x1000), .map = scms_usb3318_map,
Takashi Iwai
AppliedAt Wed, 03 Jun 2015 11:36:42 +0200,
Quoted 6 lines · Clemens Ladisch
Add mixer control names for the ESI Maya44 USB+ (which appears to be identical width the AudioTrak Maya44 USB).
Reported-by nightmixes <[email protected]>Signed-off-by Clemens Ladisch <[email protected]>
Applied, thanks.
Takashi
Quoted 15 lines
sound/usb/mixer_maps.c +5
-0@@ -437,6 +437,11 @@ static struct usbmix_ctl_map usbmix_ctl_ .map = ebox44_map, }, { +/* MAYA44 USB+ */ + .id = USB_ID(0x2573, 0x0008), + .map = maya44_map, + }, + {/* KEF X300A */ .id = USB_ID(0x27ac, 0x1000), .map = scms_usb3318_map,
PATCH 1/1 ALSA: usb-audio: fix missing input volume controls in MAYA44 USB(+)
In reply to a message not in the archiveThe driver worked around an error in the MAYA44 USB(+)'s mixer unit descriptor by aborting before parsing the missing field. However, aborting parsing too early prevented parsing of the other units connected to this unit, so the capture mixer controls would be missing.
Fix this by moving the check for this descriptor error after the parsing of the unit's input pins.
sound/usb/mixer.c +3 -6
@@ -1583,18 +1583,15 @@ static int parse_audio_mixer_unit(struct unitid);return -EINVAL ; } -/* no bmControls field (e.g. Maya44) -> ignore */ -if (desc->bLength <=10 + input_pins) { -usb_audio_dbg (state->chip,"MU %d has no bmControls field\n" , - unitid); -return 0 ; - } num_ins =0 ; ich =0 ;for (pin =0 ; pin < input_pins; pin++) { err =parse_audio_unit (state, desc->baSourceID[pin]);if (err <0 ) +continue ; +/* no bmControls field (e.g. Maya44) -> ignore */ +if (desc->bLength <=10 + input_pins)continue ; err =check_input_term (state, desc->baSourceID[pin], &iterm);if (err <0 )
Takashi Iwai
AppliedRe: [PATCH] ALSA: usb-audio: fix missing input volume controls in MAYA44 USB(+)
At Wed, 03 Jun 2015 11:36:51 +0200,
Quoted 6 lines · Clemens Ladisch
The driver worked around an error in the MAYA44 USB(+)'s mixer unit descriptor by aborting before parsing the missing field. However, aborting parsing too early prevented parsing of the other units connected to this unit, so the capture mixer controls would be missing.
Quoted 6 lines
Fix this by moving the check for this descriptor error after the parsing of the unit's input pins.
Reported-by nightmixes <[email protected]>Tested-by nightmixes <[email protected]>Signed-off-by Clemens Ladisch <[email protected]>
Applied, thanks.
Takashi
Quoted 26 lines
sound/usb/mixer.c +3
-6@@ -1583,18 +1583,15 @@ static int parse_audio_mixer_unit(struct unitid);return -EINVAL ; } -/* no bmControls field (e.g. Maya44) -> ignore */ -if (desc->bLength <=10 + input_pins) { -usb_audio_dbg (state->chip,"MU %d has no bmControls field\n" , - unitid); -return 0 ; - } num_ins =0 ; ich =0 ;for (pin =0 ; pin < input_pins; pin++) { err =parse_audio_unit (state, desc->baSourceID[pin]);if (err <0 ) +continue ; +/* no bmControls field (e.g. Maya44) -> ignore */ +if (desc->bLength <=10 + input_pins)continue ; err =check_input_term (state, desc->baSourceID[pin], &iterm);if (err <0 )