diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-02-08 14:22:45 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-02-08 14:22:57 +0100 |
| commit | 7b48b3b2263c275168b6c6192d487d939c097e8d (patch) | |
| tree | 43368b4b44e118f504289509dcadb188b66f4025 /sound/usb | |
| parent | d02cac152c97dffcb0cdd91e09b54fd6e2cca63d (diff) | |
| parent | 0a5cf9e88b5178d15f00f3cf35081841d80403cd (diff) | |
| download | linux-7b48b3b2263c275168b6c6192d487d939c097e8d.tar.gz linux-7b48b3b2263c275168b6c6192d487d939c097e8d.tar.bz2 linux-7b48b3b2263c275168b6c6192d487d939c097e8d.zip | |
Merge branch 'for-linus' into for-next
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/pcm.c | 9 | ||||
| -rw-r--r-- | sound/usb/quirks.c | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index 382847154227..db114f3977e0 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -314,6 +314,9 @@ static int search_roland_implicit_fb(struct usb_device *dev, int ifnum, return 0; } +/* Setup an implicit feedback endpoint from a quirk. Returns 0 if no quirk + * applies. Returns 1 if a quirk was found. + */ static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs, struct usb_device *dev, struct usb_interface_descriptor *altsd, @@ -384,7 +387,7 @@ add_sync_ep: subs->data_endpoint->sync_master = subs->sync_endpoint; - return 0; + return 1; } static int set_sync_endpoint(struct snd_usb_substream *subs, @@ -423,6 +426,10 @@ static int set_sync_endpoint(struct snd_usb_substream *subs, if (err < 0) return err; + /* endpoint set by quirk */ + if (err > 0) + return 0; + if (altsd->bNumEndpoints < 2) return 0; diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index ef67d19117c4..f372c624bbf4 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1553,6 +1553,7 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip, case 0x20b1: /* XMOS based devices */ case 0x152a: /* Thesycon devices */ case 0x25ce: /* Mytek devices */ + case 0x2ab6: /* T+A devices */ if (fp->dsd_raw) return SNDRV_PCM_FMTBIT_DSD_U32_BE; break; |