From 5deb974d6f378c7b8914ee8cc07dd75178b4cffb Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: Tue, 22 Jun 2010 11:25:03 -0700
Subject: [PATCH] --- yaml --- r: 202175 b: refs/heads/master c:
 4aaf504670e38da9cb929988cdce05648fa635a7 h: refs/heads/master i:   202173:
 df745fde2320f0901b670095ee35382bfd264361   202171:
 0db9d6f835c5f295e37e3bb8e6607dd64cc2957a   202167:
 819c2268e5f7271cc008436eb687ab49ba222a6e   202159:
 ae5a443721a323453fcc76f1efc9cb39ed8b5bb6   202143:
 1b04f88ae9faebaba6f03f59c6f5f28cbc86d86a   202111:
 10e9a6f917852bffc987c016ad8af025322faff5 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/input/touchscreen/tps6507x-ts.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 918f2e4cb69e..5681adb4dabc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb76dd10b91146e9cefbb3cd4e6812c5a95ee43b
+refs/heads/master: 4aaf504670e38da9cb929988cdce05648fa635a7
diff --git a/trunk/drivers/input/touchscreen/tps6507x-ts.c b/trunk/drivers/input/touchscreen/tps6507x-ts.c
index 5b70a1419b4d..a644d18c04dc 100644
--- a/trunk/drivers/input/touchscreen/tps6507x-ts.c
+++ b/trunk/drivers/input/touchscreen/tps6507x-ts.c
@@ -355,9 +355,6 @@ static int __devexit tps6507x_ts_remove(struct platform_device *pdev)
 	struct tps6507x_ts *tsc = tps6507x_dev->ts;
 	struct input_dev *input_dev = tsc->input_dev;
 
-	if (!tsc)
-		return 0;
-
 	cancel_delayed_work_sync(&tsc->work);
 	destroy_workqueue(tsc->wq);