From: Karsten Wiese Date: Fri, 30 Dec 2011 00:42:01 +0000 (+0100) Subject: ALSA: snd-usb-us122l: Delete calls to preempt_disable X-Git-Tag: MMI-PSA29.97-13-9~16612^2~117^2~9 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d0f3a2eb9062560bebca8b923424f3ca02a331ba;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git ALSA: snd-usb-us122l: Delete calls to preempt_disable They are not needed here. Signed-off-by: Karsten Wiese Cc: stable@kernel.org Signed-off-by: Takashi Iwai --- 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",