diff options
author | Karsten Wiese <fzu@wemgehoertderstaat.de> | 2011-12-29 19:42:01 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-01-09 05:31:30 -0500 |
commit | d0f3a2eb9062560bebca8b923424f3ca02a331ba (patch) | |
tree | c5d61e8933f358cfd3d7a5fd1eea89e97a427752 /sound/usb | |
parent | 7d53a631ed92abd19d3c948a5daa535e53bd2bff (diff) |
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')
-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: | |||
674 | inurb->transfer_buffer_length = | 674 | inurb->transfer_buffer_length = |
675 | inurb->number_of_packets * | 675 | inurb->number_of_packets * |
676 | inurb->iso_frame_desc[0].length; | 676 | inurb->iso_frame_desc[0].length; |
677 | preempt_disable(); | 677 | |
678 | if (u == 0) { | 678 | if (u == 0) { |
679 | int now; | 679 | int now; |
680 | struct usb_device *dev = inurb->dev; | 680 | struct usb_device *dev = inurb->dev; |
@@ -686,19 +686,17 @@ dotry: | |||
686 | } | 686 | } |
687 | err = usb_submit_urb(inurb, GFP_ATOMIC); | 687 | err = usb_submit_urb(inurb, GFP_ATOMIC); |
688 | if (err < 0) { | 688 | if (err < 0) { |
689 | preempt_enable(); | ||
690 | snd_printk(KERN_ERR"usb_submit_urb(sk->inurb[%i])" | 689 | snd_printk(KERN_ERR"usb_submit_urb(sk->inurb[%i])" |
691 | " returned %i\n", u, err); | 690 | " returned %i\n", u, err); |
692 | return err; | 691 | return err; |
693 | } | 692 | } |
694 | err = usb_submit_urb(outurb, GFP_ATOMIC); | 693 | err = usb_submit_urb(outurb, GFP_ATOMIC); |
695 | if (err < 0) { | 694 | if (err < 0) { |
696 | preempt_enable(); | ||
697 | snd_printk(KERN_ERR"usb_submit_urb(sk->outurb[%i])" | 695 | snd_printk(KERN_ERR"usb_submit_urb(sk->outurb[%i])" |
698 | " returned %i\n", u, err); | 696 | " returned %i\n", u, err); |
699 | return err; | 697 | return err; |
700 | } | 698 | } |
701 | preempt_enable(); | 699 | |
702 | if (inurb->start_frame != outurb->start_frame) { | 700 | if (inurb->start_frame != outurb->start_frame) { |
703 | snd_printd(KERN_DEBUG | 701 | snd_printd(KERN_DEBUG |
704 | "u[%i] start_frames differ in:%u out:%u\n", | 702 | "u[%i] start_frames differ in:%u out:%u\n", |