kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[ALSA] Fix-up sleeping in sound/usb

Browse source 
USB generic driver,USB USX2Y
Description: Fix-up sleeping in sound/usb. Replace big_mdelay() with
msleep() to guarantee the task delays as expected. This also involved
replacing/removing custom sleep functions.

Patch is compile-tested.

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
This commit is contained in:
Nishanth Aravamudan 2005-07-09 10:54:37 +02:00 committed by Jaroslav Kysela
parent 989a0b248b
commit b27c187f95
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sound/usb/usbaudio.c
View file

@ -792,7 +792,7 @@ static int start_urbs(snd_usb_substream_t *subs, snd_pcm_runtime_t *runtime)
*/ */
static int wait_clear_urbs(snd_usb_substream_t *subs) static int wait_clear_urbs(snd_usb_substream_t *subs)
{ {
int timeout = HZ; unsigned long end_time = jiffies + msecs_to_jiffies(1000);
unsigned int i; unsigned int i;
int alive; int alive;
@ -812,7 +812,7 @@ static int wait_clear_urbs(snd_usb_substream_t *subs)
break; break;
set_current_state(TASK_UNINTERRUPTIBLE); set_current_state(TASK_UNINTERRUPTIBLE);
schedule_timeout(1); schedule_timeout(1);
} while (--timeout > 0); } while (time_before(jiffies, end_time));
if (alive) if (alive)
snd_printk(KERN_ERR "timeout: still %d active urbs..\n", alive); snd_printk(KERN_ERR "timeout: still %d active urbs..\n", alive);
return 0; return 0;

3
sound/usb/usx2y/usX2Yhwdep.c
View file

@ -232,8 +232,7 @@ static int snd_usX2Y_hwdep_dsp_load(snd_hwdep_t *hw, snd_hwdep_dsp_image_t *dsp)
if (err) if (err)
return err; return err;
if (dsp->index == 1) { if (dsp->index == 1) {
set_current_state(TASK_UNINTERRUPTIBLE); msleep(250); // give the device some time
schedule_timeout(HZ/4); // give the device some time
err = usX2Y_AsyncSeq04_init(priv); err = usX2Y_AsyncSeq04_init(priv);
if (err) { if (err) {
snd_printk("usX2Y_AsyncSeq04_init error \n"); snd_printk("usX2Y_AsyncSeq04_init error \n");

6
sound/usb/usx2y/usx2yhwdeppcm.c
View file

@ -50,6 +50,7 @@
Currently rawusb dma pcm buffer transport (this file) is only available to snd-usb-usx2y. Currently rawusb dma pcm buffer transport (this file) is only available to snd-usb-usx2y.
*/ */
#include <linux/delay.h>
#include "usbusx2yaudio.c" #include "usbusx2yaudio.c"
#if defined(USX2Y_NRPACKS_VARIABLE) || (!defined(USX2Y_NRPACKS_VARIABLE) && USX2Y_NRPACKS == 1) #if defined(USX2Y_NRPACKS_VARIABLE) || (!defined(USX2Y_NRPACKS_VARIABLE) && USX2Y_NRPACKS == 1)
@ -520,11 +521,8 @@ static int snd_usX2Y_usbpcm_prepare(snd_pcm_substream_t *substream)
usX2Y->hwdep_pcm_shm->playback_iso_start = -1; usX2Y->hwdep_pcm_shm->playback_iso_start = -1;
if (atomic_read(&subs->state) < state_PREPARED) { if (atomic_read(&subs->state) < state_PREPARED) {
while (usX2Y_iso_frames_per_buffer(runtime, usX2Y) > usX2Y->hwdep_pcm_shm->captured_iso_frames) { while (usX2Y_iso_frames_per_buffer(runtime, usX2Y) > usX2Y->hwdep_pcm_shm->captured_iso_frames) {
signed long timeout;
snd_printd("Wait: iso_frames_per_buffer=%i,captured_iso_frames=%i\n", usX2Y_iso_frames_per_buffer(runtime, usX2Y), usX2Y->hwdep_pcm_shm->captured_iso_frames); snd_printd("Wait: iso_frames_per_buffer=%i,captured_iso_frames=%i\n", usX2Y_iso_frames_per_buffer(runtime, usX2Y), usX2Y->hwdep_pcm_shm->captured_iso_frames);
set_current_state(TASK_INTERRUPTIBLE); if (msleep_interruptible(10)) {
timeout = schedule_timeout(HZ/100 + 1);
if (signal_pending(current)) {
err = -ERESTARTSYS; err = -ERESTARTSYS;
goto up_prepare_mutex; goto up_prepare_mutex;
} }