diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-11-22 15:22:39 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-11-22 15:22:39 -0500 |
| commit | 2ba509a6baac097cc8ae4f9741a09ba7c1c0d916 (patch) | |
| tree | 08470935de327cb438cc9ec738b0e025c3c0b556 /sound/usb | |
| parent | 2efa1d59fe5af81456393472121623c9502548ce (diff) | |
| parent | 947d299686aa9cc8aecf749d54e8475c6e498956 (diff) | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index bc3c9acc68b7..e919c2e40fa0 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c | |||
| @@ -458,7 +458,7 @@ static int configure_endpoint(struct snd_usb_substream *subs) | |||
| 458 | return ret; | 458 | return ret; |
| 459 | 459 | ||
| 460 | if (subs->sync_endpoint) | 460 | if (subs->sync_endpoint) |
| 461 | ret = snd_usb_endpoint_set_params(subs->data_endpoint, | 461 | ret = snd_usb_endpoint_set_params(subs->sync_endpoint, |
| 462 | subs->pcm_format, | 462 | subs->pcm_format, |
| 463 | subs->channels, | 463 | subs->channels, |
| 464 | subs->period_bytes, | 464 | subs->period_bytes, |