diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-06 19:48:59 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-06 19:48:59 -0400 |
| commit | fff34b3412b9401a76ba9d021db1bd91cb0e02b6 (patch) | |
| tree | 870ed2d1555004e7939d15b5099017aae61c97b8 /sound/usb/endpoint.c | |
| parent | 28e1e58fb668e262648fb8ee8a24154633f40507 (diff) | |
| parent | 636802ef96eebe279b22ad9f9dacfe29291e45c7 (diff) | |
Merge branch 'merge' into next
Brings in various bug fixes from 3.6-rcX
Diffstat (limited to 'sound/usb/endpoint.c')
| -rw-r--r-- | sound/usb/endpoint.c | 4 |
1 files changed, 0 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; |