---

yaml --- r: 22683 b: refs/heads/master c: e03173f h: refs/heads/master i: 22681: 17d7d5c 22679: 189fb88 v: v3
git-mirror · Mar 22, 2006 · d6a6874 · d6a6874
1 parent 1c3e4d7
commit d6a6874
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34226c4239861654c69888e6e98973b2cc908c0b
+refs/heads/master: e03173fce2f2c233b755f2d668d6d4247a717453
diff --git a/trunk/sound/usb/usbmidi.c b/trunk/sound/usb/usbmidi.c
@@ -1092,6 +1092,8 @@ static struct {
 	{ USB_ID(0x086a, 0x0001), 8, "%s Broadcast" },
 	{ USB_ID(0x086a, 0x0002), 8, "%s Broadcast" },
 	{ USB_ID(0x086a, 0x0003), 4, "%s Broadcast" },
+	/* Edirol UM-3ex */
+	{ USB_ID(0x0582, 0x009a), 3, "%s Control" },
 };
 
 static void snd_usbmidi_init_substream(struct snd_usb_midi* umidi,

diff --git a/trunk/sound/usb/usbquirks.h b/trunk/sound/usb/usbquirks.h
@@ -203,6 +203,28 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 		}
 	}
 },
+{
+	USB_DEVICE(0x0582, 0x009a),
+	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+		.vendor_name = "EDIROL",
+		.product_name = "UM-3ex",
+		.ifnum = QUIRK_ANY_INTERFACE,
+		.type = QUIRK_COMPOSITE,
+		.data = (const struct snd_usb_audio_quirk[]) {
+			{
+				.ifnum = 0,
+				.type = QUIRK_MIDI_FIXED_ENDPOINT,
+				.data = & (const struct snd_usb_midi_endpoint_info) {
+					.out_cables = 0x000f,
+					.in_cables  = 0x000f
+				}
+			},
+			{
+				.ifnum = -1
+			}
+		}
+	}
+},
 {
 	USB_DEVICE(0x0582, 0x0002),
 	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {