diff options
| author | Matt Wagantall <mattw@codeaurora.org> | 2015-07-09 20:28:47 -0700 |
|---|---|---|
| committer | Matt Wagantall <mattw@codeaurora.org> | 2015-07-14 15:50:25 -0700 |
| commit | 005a80784960644924d5485037b64c0c3fb33ffe (patch) | |
| tree | 41f572dc715a772da5554faf09cf8ff88f97df42 /sound/usb | |
| parent | 3fcd73239e69115071bd6f04bc96836b25893f0a (diff) | |
| parent | f154a14e3efa547025d014d0a3f29396f03b1f74 (diff) | |
Merge tag 'v3.18.11' into msm-3.18
Linux 3.18.11
Resolve straight-forward conflicts in dma-mapping.c to
make room for the upstream change 0ef78141bea1 ("arm64:
Honor __GFP_ZERO in dma allocations")
Conflicts:
arch/arm64/mm/dma-mapping.c
Change-Id: Ic45b54f434072ddb5ddc747390706eaa1efed5d3
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/quirks-table.h | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index 83bddbdb90e9..5293b5ac8b9d 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -1773,6 +1773,36 @@ YAMAHA_DEVICE(0x7010, "UB99"), } } }, +{ + USB_DEVICE(0x0582, 0x0159), + .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { + /* .vendor_name = "Roland", */ + /* .product_name = "UA-22", */ + .ifnum = QUIRK_ANY_INTERFACE, + .type = QUIRK_COMPOSITE, + .data = (const struct snd_usb_audio_quirk[]) { + { + .ifnum = 0, + .type = QUIRK_AUDIO_STANDARD_INTERFACE + }, + { + .ifnum = 1, + .type = QUIRK_AUDIO_STANDARD_INTERFACE + }, + { + .ifnum = 2, + .type = QUIRK_MIDI_FIXED_ENDPOINT, + .data = & (const struct snd_usb_midi_endpoint_info) { + .out_cables = 0x0001, + .in_cables = 0x0001 + } + }, + { + .ifnum = -1 + } + } + } +}, /* this catches most recent vendor-specific Roland devices */ { .match_flags = USB_DEVICE_ID_MATCH_VENDOR | |