diff options
| author | Karsten Wiese <fzu@wemgehoertderstaat.de> | 2011-12-30 01:42:01 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-25 17:24:33 -0800 |
| commit | 730580b66c412cd8fbe9c7077ce42c55a85e6281 (patch) | |
| tree | 9633c79c48c9b2768c3bf239b1d610b3b73bb6cd /sound | |
| parent | 0146b288f47cc3ef3f0791b3023643ccdeeeb339 (diff) | |
| download | linux-stable-730580b66c412cd8fbe9c7077ce42c55a85e6281.tar.gz linux-stable-730580b66c412cd8fbe9c7077ce42c55a85e6281.tar.bz2 linux-stable-730580b66c412cd8fbe9c7077ce42c55a85e6281.zip | |
ALSA: snd-usb-us122l: Delete calls to preempt_disable
commit d0f3a2eb9062560bebca8b923424f3ca02a331ba upstream.
They are not needed here.
Signed-off-by: Karsten Wiese <fzu@wemgehoertderstaat.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/usb/usx2y/usb_stream.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/usb/usx2y/usb_stream.c b/sound/usb/usx2y/usb_stream.c index c400ade3ff08..1e7a47a86605 100644 --- a/sound/usb/usx2y/usb_stream.c +++ b/sound/usb/usx2y/usb_stream.c @@ -674,7 +674,7 @@ dotry: inurb->transfer_buffer_length = inurb->number_of_packets * inurb->iso_frame_desc[0].length; - preempt_disable(); + if (u == 0) { int now; struct usb_device *dev = inurb->dev; @@ -686,19 +686,17 @@ dotry: } err = usb_submit_urb(inurb, GFP_ATOMIC); if (err < 0) { - preempt_enable(); snd_printk(KERN_ERR"usb_submit_urb(sk->inurb[%i])" " returned %i\n", u, err); return err; } err = usb_submit_urb(outurb, GFP_ATOMIC); if (err < 0) { - preempt_enable(); snd_printk(KERN_ERR"usb_submit_urb(sk->outurb[%i])" " returned %i\n", u, err); return err; } - preempt_enable(); + if (inurb->start_frame != outurb->start_frame) { snd_printd(KERN_DEBUG "u[%i] start_frames differ in:%u out:%u\n", |