From: Domen Puncer Reorder add_wait_queue() and set_current_state() as a signal could be lost in between the two functions. Signed-off-by: Nishanth Aravamudan Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton --- 25-akpm/drivers/char/snsc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/char/snsc.c~char-snsc-reorder-set_current_state-and-add_wait_queue drivers/char/snsc.c --- 25/drivers/char/snsc.c~char-snsc-reorder-set_current_state-and-add_wait_queue 2005-03-06 19:57:06.000000000 -0800 +++ 25-akpm/drivers/char/snsc.c 2005-03-06 19:57:06.000000000 -0800 @@ -192,8 +192,8 @@ scdrv_read(struct file *file, char __use } len = CHUNKSIZE; - add_wait_queue(&sd->sd_rq, &wait); set_current_state(TASK_INTERRUPTIBLE); + add_wait_queue(&sd->sd_rq, &wait); spin_unlock_irqrestore(&sd->sd_rlock, flags); schedule_timeout(SCDRV_TIMEOUT); @@ -288,8 +288,8 @@ scdrv_write(struct file *file, const cha return -EAGAIN; } - add_wait_queue(&sd->sd_wq, &wait); set_current_state(TASK_INTERRUPTIBLE); + add_wait_queue(&sd->sd_wq, &wait); spin_unlock_irqrestore(&sd->sd_wlock, flags); schedule_timeout(SCDRV_TIMEOUT); _