summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorXie XiuQi <xiexiuqi@huawei.com>2013-11-19 13:15:43 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2013-11-20 21:15:26 -0800
commit0221e670cd25bb41062031eaa653f6447707abc6 (patch)
treee59d0dae8f127824e99e4cfc01bb927f244bb809 /drivers/input
parentbdb5c57f209c3b78b3511476b233562496acd997 (diff)
Input: cyttsp4 - remove unnecessary work pending test
Remove unnecessary work pending test before calling schedule_work(). It has been tested in queue_work_on() already. Signed-off-by: Xie XiuQi <xiexiuqi@huawei.com> Reviewed-by: Tejun Heo <tj@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/cyttsp4_core.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/cyttsp4_core.c b/drivers/input/touchscreen/cyttsp4_core.c
index 42d830efa316..a035a390f8e2 100644
--- a/drivers/input/touchscreen/cyttsp4_core.c
+++ b/drivers/input/touchscreen/cyttsp4_core.c
@@ -1246,8 +1246,7 @@ static void cyttsp4_watchdog_timer(unsigned long handle)
dev_vdbg(cd->dev, "%s: Watchdog timer triggered\n", __func__);
- if (!work_pending(&cd->watchdog_work))
- schedule_work(&cd->watchdog_work);
+ schedule_work(&cd->watchdog_work);
return;
}