summaryrefslogtreecommitdiffstats
path: root/sound/usb/usx2y
diff options
context:
space:
mode:
authorKarsten Wiese <fzu@wemgehoertderstaat.de>2011-12-30 01:42:01 +0100
committerTakashi Iwai <tiwai@suse.de>2012-01-09 11:31:30 +0100
commitd0f3a2eb9062560bebca8b923424f3ca02a331ba (patch)
treec5d61e8933f358cfd3d7a5fd1eea89e97a427752 /sound/usb/usx2y
parent7d53a631ed92abd19d3c948a5daa535e53bd2bff (diff)
downloadblackbird-op-linux-d0f3a2eb9062560bebca8b923424f3ca02a331ba.tar.gz
blackbird-op-linux-d0f3a2eb9062560bebca8b923424f3ca02a331ba.zip
ALSA: snd-usb-us122l: Delete calls to preempt_disable
They are not needed here. Signed-off-by: Karsten Wiese <fzu@wemgehoertderstaat.de> Cc: stable@kernel.org Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/usx2y')
-rw-r--r--sound/usb/usx2y/usb_stream.c6
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",
OpenPOWER on IntegriCloud