diff options
| author | Davidlohr Bueso <dave@stgolabs.net> | 2015-01-14 23:11:43 -0800 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-01-15 08:32:27 +0100 |
| commit | fd4e8dde42bb142448e3fd7dc6094cb2707d3b64 (patch) | |
| tree | a439b1bd8a0d89c72ab2eff4cd1601cb85a7dc54 /sound/oss | |
| parent | 7b617289b699b5f7e4544bfd2794818cb880b928 (diff) | |
| download | linux-stable-fd4e8dde42bb142448e3fd7dc6094cb2707d3b64.tar.gz linux-stable-fd4e8dde42bb142448e3fd7dc6094cb2707d3b64.tar.bz2 linux-stable-fd4e8dde42bb142448e3fd7dc6094cb2707d3b64.zip | |
sound/oss: use current->state helpers
Call __set_current_state() instead of assigning the new state directly.
These interfaces also aid CONFIG_DEBUG_ATOMIC_SLEEP environments, keeping
track of who changed the state.
Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/oss')
| -rw-r--r-- | sound/oss/msnd_pinnacle.c | 4 | ||||
| -rw-r--r-- | sound/oss/swarm_cs4297a.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/oss/msnd_pinnacle.c b/sound/oss/msnd_pinnacle.c index c23f9f95bfa5..a8ceef8d1a8d 100644 --- a/sound/oss/msnd_pinnacle.c +++ b/sound/oss/msnd_pinnacle.c @@ -675,7 +675,7 @@ static void dsp_write_flush(void) timeout); clear_bit(F_WRITEFLUSH, &dev.flags); if (!signal_pending(current)) { - current->state = TASK_INTERRUPTIBLE; + __set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(get_play_delay_jiffies(DAP_BUFF_SIZE)); } clear_bit(F_WRITING, &dev.flags); @@ -1288,7 +1288,7 @@ static int __init calibrate_adc(WORD srate) & ~0x0001, dev.SMA + SMA_wCurrHostStatusFlags); if (msnd_send_word(&dev, 0, 0, HDEXAR_CAL_A_TO_D) == 0 && chk_send_dsp_cmd(&dev, HDEX_AUX_REQ) == 0) { - current->state = TASK_INTERRUPTIBLE; + __set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(HZ / 3); return 0; } diff --git a/sound/oss/swarm_cs4297a.c b/sound/oss/swarm_cs4297a.c index a33e8ce8085b..213a416b6e0b 100644 --- a/sound/oss/swarm_cs4297a.c +++ b/sound/oss/swarm_cs4297a.c @@ -1654,7 +1654,7 @@ static int drain_dac(struct cs4297a_state *s, int nonblock) s->dma_dac.hwptr = s->dma_dac.swptr = hwptr; spin_unlock_irqrestore(&s->lock, flags); remove_wait_queue(&s->dma_dac.wait, &wait); - current->state = TASK_RUNNING; + __set_current_state(TASK_RUNNING); return 0; } |