projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 7f055204 GKH |
1 | From d0f3a2eb9062560bebca8b923424f3ca02a331ba Mon Sep 17 00:00:00 2001 |
| 2 | From: Karsten Wiese <fzu@wemgehoertderstaat.de> | |
| 3 | Date: Fri, 30 Dec 2011 01:42:01 +0100 | |
| 4 | Subject: ALSA: snd-usb-us122l: Delete calls to preempt_disable | |
| 5 | ||
| 6 | From: Karsten Wiese <fzu@wemgehoertderstaat.de> | |
| 7 | ||
| 8 | commit d0f3a2eb9062560bebca8b923424f3ca02a331ba upstream. | |
| 9 | ||
| 10 | They are not needed here. | |
| 11 | ||
| 12 | Signed-off-by: Karsten Wiese <fzu@wemgehoertderstaat.de> | |
| 13 | Signed-off-by: Takashi Iwai <tiwai@suse.de> | |
| 14 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
| 15 | ||
| 16 | --- | |
| 17 | sound/usb/usx2y/usb_stream.c | 6 ++---- | |
| 18 | 1 file changed, 2 insertions(+), 4 deletions(-) | |
| 19 | ||
| 20 | --- a/sound/usb/usx2y/usb_stream.c | |
| 21 | +++ b/sound/usb/usx2y/usb_stream.c | |
| 22 | @@ -674,7 +674,7 @@ dotry: | |
| 23 | inurb->transfer_buffer_length = | |
| 24 | inurb->number_of_packets * | |
| 25 | inurb->iso_frame_desc[0].length; | |
| 26 | - preempt_disable(); | |
| 27 | + | |
| 28 | if (u == 0) { | |
| 29 | int now; | |
| 30 | struct usb_device *dev = inurb->dev; | |
| 31 | @@ -686,19 +686,17 @@ dotry: | |
| 32 | } | |
| 33 | err = usb_submit_urb(inurb, GFP_ATOMIC); | |
| 34 | if (err < 0) { | |
| 35 | - preempt_enable(); | |
| 36 | snd_printk(KERN_ERR"usb_submit_urb(sk->inurb[%i])" | |
| 37 | " returned %i\n", u, err); | |
| 38 | return err; | |
| 39 | } | |
| 40 | err = usb_submit_urb(outurb, GFP_ATOMIC); | |
| 41 | if (err < 0) { | |
| 42 | - preempt_enable(); | |
| 43 | snd_printk(KERN_ERR"usb_submit_urb(sk->outurb[%i])" | |
| 44 | " returned %i\n", u, err); | |
| 45 | return err; | |
| 46 | } | |
| 47 | - preempt_enable(); | |
| 48 | + | |
| 49 | if (inurb->start_frame != outurb->start_frame) { | |
| 50 | snd_printd(KERN_DEBUG | |
| 51 | "u[%i] start_frames differ in:%u out:%u\n", |