From 311ac579b27eede59787ca67f691c6600a2c3e32 Mon Sep 17 00:00:00 2001 From: "Robert P. J. Day" Date: Mon, 28 Apr 2008 02:14:24 -0700 Subject: [PATCH] --- yaml --- r: 94105 b: refs/heads/master c: f7440b0ecdeb3a04d07c546d02d29700d2a574b7 h: refs/heads/master i: 94103: 026541a9982ca72c718e7c483ddbc13b0c24327a v: v3 --- [refs] | 2 +- trunk/drivers/mfd/ucb1x00-ts.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index db9a66e22d8c..38b62716051c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 61711f8fd8180e458cfb6846bcf4fc636a95f3db +refs/heads/master: f7440b0ecdeb3a04d07c546d02d29700d2a574b7 diff --git a/trunk/drivers/mfd/ucb1x00-ts.c b/trunk/drivers/mfd/ucb1x00-ts.c index 5e859486eaf8..ad34e2d22524 100644 --- a/trunk/drivers/mfd/ucb1x00-ts.c +++ b/trunk/drivers/mfd/ucb1x00-ts.c @@ -204,8 +204,7 @@ static inline int ucb1x00_ts_pen_down(struct ucb1x00_ts *ts) static int ucb1x00_thread(void *_ts) { struct ucb1x00_ts *ts = _ts; - struct task_struct *tsk = current; - DECLARE_WAITQUEUE(wait, tsk); + DECLARE_WAITQUEUE(wait, current); int valid = 0; set_freezable(); @@ -234,7 +233,7 @@ static int ucb1x00_thread(void *_ts) if (ucb1x00_ts_pen_down(ts)) { - set_task_state(tsk, TASK_INTERRUPTIBLE); + set_current_state(TASK_INTERRUPTIBLE); ucb1x00_enable_irq(ts->ucb, UCB_IRQ_TSPX, machine_is_collie() ? UCB_RISING : UCB_FALLING); ucb1x00_disable(ts->ucb); @@ -262,7 +261,7 @@ static int ucb1x00_thread(void *_ts) valid = 1; } - set_task_state(tsk, TASK_INTERRUPTIBLE); + set_current_state(TASK_INTERRUPTIBLE); timeout = HZ / 100; }