diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-08-02 21:35:17 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-08-02 21:35:17 -0400 |
| commit | d01d0756f75e7a5b4b43764ad45b83c4340f11d6 (patch) | |
| tree | 90db2ff7ccb35a8fdcf98366e6404afe1f845bc4 /drivers/input/touchscreen/tps6507x-ts.c | |
| parent | b326b853dca2f410b254198ee89abad71a2f4668 (diff) | |
| parent | 0d87c7228a49e8342d60dd552892e470e0b291fa (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/touchscreen/tps6507x-ts.c')
| -rw-r--r-- | drivers/input/touchscreen/tps6507x-ts.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/input/touchscreen/tps6507x-ts.c b/drivers/input/touchscreen/tps6507x-ts.c index 5b70a1419b4d..a644d18c04dc 100644 --- a/drivers/input/touchscreen/tps6507x-ts.c +++ b/drivers/input/touchscreen/tps6507x-ts.c | |||
| @@ -355,9 +355,6 @@ static int __devexit tps6507x_ts_remove(struct platform_device *pdev) | |||
| 355 | struct tps6507x_ts *tsc = tps6507x_dev->ts; | 355 | struct tps6507x_ts *tsc = tps6507x_dev->ts; |
| 356 | struct input_dev *input_dev = tsc->input_dev; | 356 | struct input_dev *input_dev = tsc->input_dev; |
| 357 | 357 | ||
| 358 | if (!tsc) | ||
| 359 | return 0; | ||
| 360 | |||
| 361 | cancel_delayed_work_sync(&tsc->work); | 358 | cancel_delayed_work_sync(&tsc->work); |
| 362 | destroy_workqueue(tsc->wq); | 359 | destroy_workqueue(tsc->wq); |
| 363 | 360 | ||