ALSA: usb-audio: Fix Yamaha P-125 Quirk Entry

[ Upstream commit 6f891ca15b017707840c9e7f5afd9fc6cfd7d8b1 ]

This patch switches the P-125 quirk entry to use a composite quirk as the
P-125 supplies both MIDI and Audio like many of the other Yamaha
keyboards

Signed-off-by: Eryk Zagorski <erykzagorski@gmail.com>
Link: https://patch.msgid.link/20241111164520.9079-2-erykzagorski@gmail.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
index c6104523dd79c0c19daae6b8c328ed9df45914f1..119c0bde74464b3fa7afa6766c0201526f485220 100644 (file)
--- a/sound/usb/quirks-table.h
+++ b/sound/usb/quirks-table.h
@@ -350,7 +350,6 @@ YAMAHA_DEVICE(0x105a, NULL),
 YAMAHA_DEVICE(0x105b, NULL),
 YAMAHA_DEVICE(0x105c, NULL),
 YAMAHA_DEVICE(0x105d, NULL),
-YAMAHA_DEVICE(0x1718, "P-125"),
 {
        USB_DEVICE(0x0499, 0x1503),
        .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
@@ -485,6 +484,19 @@ YAMAHA_DEVICE(0x1718, "P-125"),
                }
        }
 },
+{
+       USB_DEVICE(0x0499, 0x1718),
+       QUIRK_DRIVER_INFO {
+               /* .vendor_name = "Yamaha", */
+               /* .product_name = "P-125", */
+               QUIRK_DATA_COMPOSITE {
+                       { QUIRK_DATA_STANDARD_AUDIO(1) },
+                       { QUIRK_DATA_STANDARD_AUDIO(2) },
+                       { QUIRK_DATA_MIDI_YAMAHA(3) },
+                       QUIRK_COMPOSITE_END
+               }
+       }
+},
 YAMAHA_DEVICE(0x2000, "DGP-7"),
 YAMAHA_DEVICE(0x2001, "DGP-5"),
 YAMAHA_DEVICE(0x2002, NULL),