diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-01-23 08:31:34 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-01-23 08:31:34 +0100 |
| commit | e152f18027552eb34006b35347e72bc805783027 (patch) | |
| tree | ac9765e68597c08c24de447f46bb3e04d9881e1b /sound/usb/pcm.c | |
| parent | 49ba4f94bddb7f5272c4596d505f94355cc3fbd2 (diff) | |
| parent | 42c364ace52ae6b4699105b39f2559c256b6cd4c (diff) | |
| download | talos-obmc-linux-e152f18027552eb34006b35347e72bc805783027.tar.gz talos-obmc-linux-e152f18027552eb34006b35347e72bc805783027.zip | |
Merge branch 'for-linus' into for-next
This is a preliminary merge before the upcoming merge of generic parser
branch.
Diffstat (limited to 'sound/usb/pcm.c')
| -rw-r--r-- | sound/usb/pcm.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index 3a384479e923..b839b60f9858 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -515,6 +515,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, |
