diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-03-16 09:48:05 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-03-16 09:48:05 -0400 |
| commit | 34e72afe73c40d9974c1f230c3b62fc43f5c5b28 (patch) | |
| tree | fee2be2e3453e246ee55ffb711a36a8ec053361a /sound/usb | |
| parent | e79d74ab25339437447478e4dfe2b35c5b560512 (diff) | |
| parent | cc261738add93947d138d2fabad9f4dbed4e5c00 (diff) | |
Merge branch 'for-linus' into for-next
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 67d476548dcf..07f984d5f516 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h | |||
| @@ -1773,6 +1773,36 @@ YAMAHA_DEVICE(0x7010, "UB99"), | |||
| 1773 | } | 1773 | } |
| 1774 | } | 1774 | } |
| 1775 | }, | 1775 | }, |
| 1776 | { | ||
| 1777 | USB_DEVICE(0x0582, 0x0159), | ||
| 1778 | .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { | ||
| 1779 | /* .vendor_name = "Roland", */ | ||
| 1780 | /* .product_name = "UA-22", */ | ||
| 1781 | .ifnum = QUIRK_ANY_INTERFACE, | ||
| 1782 | .type = QUIRK_COMPOSITE, | ||
| 1783 | .data = (const struct snd_usb_audio_quirk[]) { | ||
| 1784 | { | ||
| 1785 | .ifnum = 0, | ||
| 1786 | .type = QUIRK_AUDIO_STANDARD_INTERFACE | ||
| 1787 | }, | ||
| 1788 | { | ||
| 1789 | .ifnum = 1, | ||
| 1790 | .type = QUIRK_AUDIO_STANDARD_INTERFACE | ||
| 1791 | }, | ||
| 1792 | { | ||
| 1793 | .ifnum = 2, | ||
| 1794 | .type = QUIRK_MIDI_FIXED_ENDPOINT, | ||
| 1795 | .data = & (const struct snd_usb_midi_endpoint_info) { | ||
| 1796 | .out_cables = 0x0001, | ||
| 1797 | .in_cables = 0x0001 | ||
| 1798 | } | ||
| 1799 | }, | ||
| 1800 | { | ||
| 1801 | .ifnum = -1 | ||
| 1802 | } | ||
| 1803 | } | ||
| 1804 | } | ||
| 1805 | }, | ||
| 1776 | /* this catches most recent vendor-specific Roland devices */ | 1806 | /* this catches most recent vendor-specific Roland devices */ |
| 1777 | { | 1807 | { |
| 1778 | .match_flags = USB_DEVICE_ID_MATCH_VENDOR | | 1808 | .match_flags = USB_DEVICE_ID_MATCH_VENDOR | |