1 files changed, 38 insertions, 37 deletions

diff --git a/sound/usb/usbquirks.h b/sound/usb/usbquirks.h
index 938dff5f9cef..82a8d14c26af 100644
--- a/sound/usb/usbquirks.h
+++ b/sound/usb/usbquirks.h
@@ -39,6 +39,30 @@
         .idProduct = prod, \
         .bInterfaceClass = USB_CLASS_VENDOR_SPEC
 
+/* Creative/E-Mu devices */
+{
+        USB_DEVICE(0x041e, 0x3010),
+        .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+                .vendor_name = "Creative Labs",
+                .product_name = "Sound Blaster MP3+",
+                .ifnum = QUIRK_NO_INTERFACE
+        }
+},
+{
+        /* E-Mu 0202 USB */
+        .match_flags = USB_DEVICE_ID_MATCH_DEVICE,
+        .idVendor = 0x041e,
+        .idProduct = 0x3f02,
+        .bInterfaceClass = USB_CLASS_AUDIO,
+},
+{
+        /* E-Mu 0404 USB */
+        .match_flags = USB_DEVICE_ID_MATCH_DEVICE,
+        .idVendor = 0x041e,
+        .idProduct = 0x3f04,
+        .bInterfaceClass = USB_CLASS_AUDIO,
+},
+
 /*
  * Logitech QuickCam: bDeviceClass is vendor-specific, so generic interface
  * class matches do not take effect without an explicit ID match.
@@ -97,19 +121,7 @@
         .bInterfaceClass = USB_CLASS_AUDIO,
         .bInterfaceSubClass = USB_SUBCLASS_AUDIO_CONTROL
 },
-/* E-Mu devices */
-{
-        .match_flags = USB_DEVICE_ID_MATCH_DEVICE,
-        .idVendor = 0x041e,
-        .idProduct = 0x3f02,
-        .bInterfaceClass = USB_CLASS_AUDIO,
-},
-{
-        .match_flags = USB_DEVICE_ID_MATCH_DEVICE,
-        .idVendor = 0x041e,
-        .idProduct = 0x3f04,
-        .bInterfaceClass = USB_CLASS_AUDIO,
-},
+
 /*
  * Yamaha devices
  */
@@ -1165,19 +1177,6 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                 }
         }
 },
-{
-        USB_DEVICE(0x582, 0x00a6),
-        .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-                .vendor_name = "Roland",
-                .product_name = "Juno-G",
-                .ifnum = 0,
-                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-                .data = & (const struct snd_usb_midi_endpoint_info) {
-                        .out_cables = 0x0001,
-                        .in_cables  = 0x0001
-                }
-        }
-},
 {       /*
          * This quirk is for the "Advanced" modes of the Edirol UA-25.
          * If the switch is not in an advanced setting, the UA-25 has
@@ -1336,6 +1335,19 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 },
         /* TODO: add Edirol MD-P1 support */
 {
+        USB_DEVICE(0x582, 0x00a6),
+        .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+                .vendor_name = "Roland",
+                .product_name = "Juno-G",
+                .ifnum = 0,
+                .type = QUIRK_MIDI_FIXED_ENDPOINT,
+                .data = & (const struct snd_usb_midi_endpoint_info) {
+                        .out_cables = 0x0001,
+                        .in_cables  = 0x0001
+                }
+        }
+},
+{
         /* Roland SH-201 */
         USB_DEVICE(0x0582, 0x00ad),
         .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
@@ -1719,17 +1731,6 @@ YAMAHA_DEVICE(0x7010, "UB99"),
         }
 },
 
-{
-        /* Creative Sound Blaster MP3+ */
-        USB_DEVICE(0x041e, 0x3010),
-        .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-                .vendor_name = "Creative Labs",
-                .product_name = "Sound Blaster MP3+",
-                .ifnum = QUIRK_NO_INTERFACE
-        }
-        
-},
-
 /* Emagic devices */
 {
         USB_DEVICE(0x086a, 0x0001),