forked from luck/tmp_suning_uos_patched
19418ed317
commit 785b6f29a795f109685f286b91e0250c206fbffb upstream. The current way of the scarlett2 mixer code managing the usb_mixer_elem_info object is wrong in two ways: it passes its internal index to the head.id field, and the val_type field is uninitialized. This ended up with the wrong execution at the resume because a bogus unit id is passed wrongly. Also, in the later code extensions, we'll have more mixer elements, and passing the index will overflow the unit id size (of 256). This patch corrects those issues. It introduces a new value type, USB_MIXER_BESPOKEN, which indicates a non-standard mixer element, and use this type for all scarlett2 mixer elements, as well as initializing the fixed unit id 0 for avoiding the overflow. Tested-by: Geoffrey D. Bennett <g@b4.vu> Signed-off-by: Geoffrey D. Bennett <g@b4.vu> Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/49721219f45b7e175e729b0d9d9c142fd8f4342a.1624379707.git.g@b4.vu Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
||
|---|---|---|
| .. | ||
| 6fire | ||
| bcd2000 | ||
| caiaq | ||
| hiface | ||
| line6 | ||
| misc | ||
| usx2y | ||
| card.c | ||
| card.h | ||
| clock.c | ||
| clock.h | ||
| debug.h | ||
| endpoint.c | ||
| endpoint.h | ||
| format.c | ||
| format.h | ||
| helper.c | ||
| helper.h | ||
| Kconfig | ||
| Makefile | ||
| media.c | ||
| media.h | ||
| midi.c | ||
| midi.h | ||
| mixer_maps.c | ||
| mixer_quirks.c | ||
| mixer_quirks.h | ||
| mixer_s1810c.c | ||
| mixer_s1810c.h | ||
| mixer_scarlett_gen2.c | ||
| mixer_scarlett_gen2.h | ||
| mixer_scarlett.c | ||
| mixer_scarlett.h | ||
| mixer_us16x08.c | ||
| mixer_us16x08.h | ||
| mixer.c | ||
| mixer.h | ||
| pcm.c | ||
| pcm.h | ||
| power.c | ||
| power.h | ||
| proc.c | ||
| proc.h | ||
| quirks-table.h | ||
| quirks.c | ||
| quirks.h | ||
| stream.c | ||
| stream.h | ||
| usbaudio.h | ||
| validate.c | ||