diff options
author | Takashi Iwai <tiwai@suse.de> | 2019-09-14 18:24:57 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2019-09-14 18:26:10 +0300 |
commit | d3f9990f1b48514b33342612b51fad238592d774 (patch) | |
tree | 9ad5ae81ba3e820e91a09e2675b7c98675bd809e /sound/usb/pcm.c | |
parent | e1a00b5b253a4f97216b9a33199a863987075162 (diff) | |
parent | 7711fb7dac1ab77fd1b4d948f4647a569e4a1ae2 (diff) | |
download | linux-d3f9990f1b48514b33342612b51fad238592d774.tar.xz |
Merge branch 'for-next' into for-linus
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/pcm.c')
-rw-r--r-- | sound/usb/pcm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index e4bbf79de956..33cd26763c0e 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -457,6 +457,7 @@ static int set_sync_endpoint(struct snd_usb_substream *subs, } ep = get_endpoint(alts, 1)->bEndpointAddress; if (get_endpoint(alts, 0)->bLength >= USB_DT_ENDPOINT_AUDIO_SIZE && + get_endpoint(alts, 0)->bSynchAddress != 0 && ((is_playback && ep != (unsigned int)(get_endpoint(alts, 0)->bSynchAddress | USB_DIR_IN)) || (!is_playback && ep != (unsigned int)(get_endpoint(alts, 0)->bSynchAddress & ~USB_DIR_IN)))) { dev_err(&dev->dev, |