]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ALSA: snd-usb-us122l: Delete calls to preempt_disable
authorKarsten Wiese <fzu@wemgehoertderstaat.de>
Fri, 30 Dec 2011 00:42:01 +0000 (01:42 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 25 Jan 2012 21:53:18 +0000 (13:53 -0800)
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>
sound/usb/usx2y/usb_stream.c

index 12ae0340adc0b37d826661bff498ed5ab954b766..dafcf79c2ba397b0881c18274d797ea98b6a012c 100644 (file)
@@ -673,7 +673,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;
@@ -685,19 +685,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",