From a6572e22bc0752c1ece008ac30fbc9a79fa91b0a Mon Sep 17 00:00:00 2001
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Sun, 4 Mar 2012 09:26:15 -0800
Subject: [PATCH] --- yaml --- r: 294020 b: refs/heads/master c:
 aaa60fa7ac66ede814f7ad37a2b3a07b4f784756 h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/input/touchscreen/cyttsp_core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 02c5072e3dd5..dd85eaa52ebe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa87512fbc56e107c14f7fa85823eb7e82a2f64c
+refs/heads/master: aaa60fa7ac66ede814f7ad37a2b3a07b4f784756
diff --git a/trunk/drivers/input/touchscreen/cyttsp_core.c b/trunk/drivers/input/touchscreen/cyttsp_core.c
index 8be22479b41c..f030d9ec795d 100644
--- a/trunk/drivers/input/touchscreen/cyttsp_core.c
+++ b/trunk/drivers/input/touchscreen/cyttsp_core.c
@@ -523,7 +523,7 @@ struct cyttsp *cyttsp_probe(const struct cyttsp_bus_ops *bus_ops,
 	struct input_dev *input_dev;
 	int error;
 
-	if (!dev || !bus_ops || !pdata || !pdata->name || irq <= 0) {
+	if (!pdata || !pdata->name || irq <= 0) {
 		error = -EINVAL;
 		goto err_out;
 	}