From a2f25df6345ebb0a30f51c2d73c23c855ea964dd Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 10 Jan 2013 14:06:38 +0100 Subject: [PATCH] --- yaml --- r: 348784 b: refs/heads/master c: 31be5425d795585251a3ee970319c37643e0cda2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/usb/pcm.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 44a4cfe2f8e9..7bc989e07194 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c18ab0bac4c377b22e03f9cd4efafa1316b76552 +refs/heads/master: 31be5425d795585251a3ee970319c37643e0cda2 diff --git a/trunk/sound/usb/pcm.c b/trunk/sound/usb/pcm.c index c6593101c049..d82e378d37cb 100644 --- a/trunk/sound/usb/pcm.c +++ b/trunk/sound/usb/pcm.c @@ -511,6 +511,16 @@ static int configure_sync_endpoint(struct snd_usb_substream *subs) struct snd_usb_substream *sync_subs = &subs->stream->substream[subs->direction ^ 1]; + if (subs->sync_endpoint->type != SND_USB_ENDPOINT_TYPE_DATA || + !subs->stream) + return snd_usb_endpoint_set_params(subs->sync_endpoint, + subs->pcm_format, + subs->channels, + subs->period_bytes, + subs->cur_rate, + subs->cur_audiofmt, + NULL); + /* Try to find the best matching audioformat. */ list_for_each_entry(fp, &sync_subs->fmt_list, list) { int score = match_endpoint_audioformats(fp, subs->cur_audiofmt,