aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/rocket.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/rocket.c')
-rw-r--r--drivers/char/rocket.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
index aa4cc12bbcb1..e249d8cfcd06 100644
--- a/drivers/char/rocket.c
+++ b/drivers/char/rocket.c
@@ -943,7 +943,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
943#endif 943#endif
944 schedule(); /* Don't hold spinlock here, will hang PC */ 944 schedule(); /* Don't hold spinlock here, will hang PC */
945 } 945 }
946 current->state = TASK_RUNNING; 946 __set_current_state(TASK_RUNNING);
947 remove_wait_queue(&info->open_wait, &wait); 947 remove_wait_queue(&info->open_wait, &wait);
948 948
949 spin_lock_irqsave(&info->slock, flags); 949 spin_lock_irqsave(&info->slock, flags);
@@ -1598,7 +1598,7 @@ static void rp_wait_until_sent(struct tty_struct *tty, int timeout)
1598 if (signal_pending(current)) 1598 if (signal_pending(current))
1599 break; 1599 break;
1600 } 1600 }
1601 current->state = TASK_RUNNING; 1601 __set_current_state(TASK_RUNNING);
1602#ifdef ROCKET_DEBUG_WAIT_UNTIL_SENT 1602#ifdef ROCKET_DEBUG_WAIT_UNTIL_SENT
1603 printk(KERN_INFO "txcnt = %d (jiff=%lu)...done\n", txcnt, jiffies); 1603 printk(KERN_INFO "txcnt = %d (jiff=%lu)...done\n", txcnt, jiffies);
1604#endif 1604#endif