diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-08-20 16:14:26 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-08-20 16:14:26 -0400 |
commit | ddf83485d7da468251716b8040bac1280622181e (patch) | |
tree | d28e9b511dedcfed447577f4bb49a99b244a9430 /sound/usb | |
parent | 099d53c308f50e8ee5b6638ec3f40f0104b3ee31 (diff) | |
parent | 535b6c51fe8293c88ce919cdfc4390c67a1cb6d1 (diff) |
Merge branch 'for-linus' into for-next
Conflicts:
sound/pci/hda/hda_codec.c
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
-rw-r--r-- | sound/usb/endpoint.c | 4 | ||||
-rw-r--r-- | sound/usb/pcm.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c index 0f647d22cb4a..c41181202688 100644 --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c | |||
@@ -821,10 +821,6 @@ int snd_usb_endpoint_start(struct snd_usb_endpoint *ep) | |||
821 | if (++ep->use_count != 1) | 821 | if (++ep->use_count != 1) |
822 | return 0; | 822 | return 0; |
823 | 823 | ||
824 | /* just to be sure */ | ||
825 | deactivate_urbs(ep, 0, 1); | ||
826 | wait_clear_urbs(ep); | ||
827 | |||
828 | ep->active_mask = 0; | 824 | ep->active_mask = 0; |
829 | ep->unlink_mask = 0; | 825 | ep->unlink_mask = 0; |
830 | ep->phase = 0; | 826 | ep->phase = 0; |
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index a1298f379428..62ec808ed792 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c | |||
@@ -544,6 +544,9 @@ static int snd_usb_pcm_prepare(struct snd_pcm_substream *substream) | |||
544 | subs->last_frame_number = 0; | 544 | subs->last_frame_number = 0; |
545 | runtime->delay = 0; | 545 | runtime->delay = 0; |
546 | 546 | ||
547 | /* clear the pending deactivation on the target EPs */ | ||
548 | deactivate_endpoints(subs); | ||
549 | |||
547 | /* for playback, submit the URBs now; otherwise, the first hwptr_done | 550 | /* for playback, submit the URBs now; otherwise, the first hwptr_done |
548 | * updates for all URBs would happen at the same time when starting */ | 551 | * updates for all URBs would happen at the same time when starting */ |
549 | if (subs->direction == SNDRV_PCM_STREAM_PLAYBACK) | 552 | if (subs->direction == SNDRV_PCM_STREAM_PLAYBACK) |