diff options
| author | Greg KH <gregkh@suse.de> | 2005-09-09 17:26:01 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-09 17:26:01 -0400 |
| commit | 8ccc457722ba226ea72fca6f9ba3b54535d4749e (patch) | |
| tree | e323eda3b7ed55a5398751021e8031c1cae56f9d /sound | |
| parent | 20dd026d7f5a6972dc78b4928a99620001fa547d (diff) | |
| parent | 5dce225bd9ea60e28e17076de63df0dee51b2883 (diff) | |
Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/usb/usbaudio.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index 5aa5fe651a..bfbec58766 100644 --- a/sound/usb/usbaudio.c +++ b/sound/usb/usbaudio.c | |||
| @@ -735,10 +735,9 @@ static int deactivate_urbs(snd_usb_substream_t *subs, int force, int can_sleep) | |||
| 735 | if (test_bit(i, &subs->active_mask)) { | 735 | if (test_bit(i, &subs->active_mask)) { |
| 736 | if (! test_and_set_bit(i, &subs->unlink_mask)) { | 736 | if (! test_and_set_bit(i, &subs->unlink_mask)) { |
| 737 | struct urb *u = subs->dataurb[i].urb; | 737 | struct urb *u = subs->dataurb[i].urb; |
| 738 | if (async) { | 738 | if (async) |
| 739 | u->transfer_flags |= URB_ASYNC_UNLINK; | ||
| 740 | usb_unlink_urb(u); | 739 | usb_unlink_urb(u); |
| 741 | } else | 740 | else |
| 742 | usb_kill_urb(u); | 741 | usb_kill_urb(u); |
| 743 | } | 742 | } |
| 744 | } | 743 | } |
| @@ -748,10 +747,9 @@ static int deactivate_urbs(snd_usb_substream_t *subs, int force, int can_sleep) | |||
| 748 | if (test_bit(i+16, &subs->active_mask)) { | 747 | if (test_bit(i+16, &subs->active_mask)) { |
| 749 | if (! test_and_set_bit(i+16, &subs->unlink_mask)) { | 748 | if (! test_and_set_bit(i+16, &subs->unlink_mask)) { |
| 750 | struct urb *u = subs->syncurb[i].urb; | 749 | struct urb *u = subs->syncurb[i].urb; |
| 751 | if (async) { | 750 | if (async) |
| 752 | u->transfer_flags |= URB_ASYNC_UNLINK; | ||
| 753 | usb_unlink_urb(u); | 751 | usb_unlink_urb(u); |
| 754 | } else | 752 | else |
| 755 | usb_kill_urb(u); | 753 | usb_kill_urb(u); |
| 756 | } | 754 | } |
| 757 | } | 755 | } |