| From d0f3a2eb9062560bebca8b923424f3ca02a331ba Mon Sep 17 00:00:00 2001 |
| From: Karsten Wiese <fzu@wemgehoertderstaat.de> |
| Date: Fri, 30 Dec 2011 01:42:01 +0100 |
| Subject: ALSA: snd-usb-us122l: Delete calls to preempt_disable |
| |
| From: Karsten Wiese <fzu@wemgehoertderstaat.de> |
| |
| 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 | 6 ++---- |
| 1 file changed, 2 insertions(+), 4 deletions(-) |
| |
| --- a/sound/usb/usx2y/usb_stream.c |
| +++ b/sound/usb/usx2y/usb_stream.c |
| @@ -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", |
