[PATCH] ALSA: usb-audio: Reorder snd_djm_devices entries
Geraldo Nascimento
geraldogabriel at gmail.com
Thu Dec 2 21:55:51 CET 2021
Olivia Mackintosh has posted to alsa-devel reporting that
there's a potential bug that could break mixer quirks for Pioneer
devices introduced by 6d27788160362a7ee6c0d317636fe4b1ddbe59a7
"ALSA: usb-audio: Add support for the Pioneer DJM 750MK2
Mixer/Soundcard".
This happened because the DJM 750 MK2 was added last to the Pioneer DJM
device table index and defined as 0x4 but was added to snd_djm_devices[]
just after the DJM 750 (MK1) entry instead of last, after the DJM 900
NXS2. This escaped review.
Let's reorder the entries in snd_djm_devices[] so they match the Pioneer
DJM device table index #define's.
Reported-by: Olivia Mackintosh <livvy at base.nu>
Signed-off-by: Geraldo Nascimento <geraldogabriel at gmail.com>
diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
index d489c1de3bae..d4cd880b5c6c 100644
--- a/sound/usb/mixer_quirks.c
+++ b/sound/usb/mixer_quirks.c
@@ -3018,9 +3018,9 @@ static const struct snd_djm_ctl snd_djm_ctls_750mk2[] = {
static const struct snd_djm_device snd_djm_devices[] = {
SND_DJM_DEVICE(250mk2),
SND_DJM_DEVICE(750),
- SND_DJM_DEVICE(750mk2),
SND_DJM_DEVICE(850),
- SND_DJM_DEVICE(900nxs2)
+ SND_DJM_DEVICE(900nxs2),
+ SND_DJM_DEVICE(750mk2)
};
More information about the Alsa-devel
mailing list