diff options
author | Davidlohr Bueso <dave@stgolabs.net> | 2015-01-15 02:11:43 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-01-15 02:32:27 -0500 |
commit | fd4e8dde42bb142448e3fd7dc6094cb2707d3b64 (patch) | |
tree | a439b1bd8a0d89c72ab2eff4cd1601cb85a7dc54 /sound/oss/msnd_pinnacle.c | |
parent | 7b617289b699b5f7e4544bfd2794818cb880b928 (diff) |
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/msnd_pinnacle.c')
-rw-r--r-- | sound/oss/msnd_pinnacle.c | 4 |
1 files changed, 2 insertions, 2 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) | |||
675 | timeout); | 675 | timeout); |
676 | clear_bit(F_WRITEFLUSH, &dev.flags); | 676 | clear_bit(F_WRITEFLUSH, &dev.flags); |
677 | if (!signal_pending(current)) { | 677 | if (!signal_pending(current)) { |
678 | current->state = TASK_INTERRUPTIBLE; | 678 | __set_current_state(TASK_INTERRUPTIBLE); |
679 | schedule_timeout(get_play_delay_jiffies(DAP_BUFF_SIZE)); | 679 | schedule_timeout(get_play_delay_jiffies(DAP_BUFF_SIZE)); |
680 | } | 680 | } |
681 | clear_bit(F_WRITING, &dev.flags); | 681 | clear_bit(F_WRITING, &dev.flags); |
@@ -1288,7 +1288,7 @@ static int __init calibrate_adc(WORD srate) | |||
1288 | & ~0x0001, dev.SMA + SMA_wCurrHostStatusFlags); | 1288 | & ~0x0001, dev.SMA + SMA_wCurrHostStatusFlags); |
1289 | if (msnd_send_word(&dev, 0, 0, HDEXAR_CAL_A_TO_D) == 0 && | 1289 | if (msnd_send_word(&dev, 0, 0, HDEXAR_CAL_A_TO_D) == 0 && |
1290 | chk_send_dsp_cmd(&dev, HDEX_AUX_REQ) == 0) { | 1290 | chk_send_dsp_cmd(&dev, HDEX_AUX_REQ) == 0) { |
1291 | current->state = TASK_INTERRUPTIBLE; | 1291 | __set_current_state(TASK_INTERRUPTIBLE); |
1292 | schedule_timeout(HZ / 3); | 1292 | schedule_timeout(HZ / 3); |
1293 | return 0; | 1293 | return 0; |
1294 | } | 1294 | } |