From 6cd97c248233277e9223bd02ce3808e68c1e3c8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Richard=20R=C3=B6jfors?=
 <richard.rojfors.ext@mocean-labs.com>
Date: Fri, 24 Jul 2009 23:14:17 -0700
Subject: [PATCH] --- yaml --- r: 161269 b: refs/heads/master c:
 cad065fd1e95003444e8528f801f52164cb78561 h: refs/heads/master i:   161267:
 af1b704203566c6d3b48da3c37ea4d85349b86f3 v: v3

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

diff --git a/[refs] b/[refs]
index da16c9df64f4..f21b5a004e0d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 141586bc57f6083f36c18d86e1cfa5916a1e7c05
+refs/heads/master: cad065fd1e95003444e8528f801f52164cb78561
diff --git a/trunk/drivers/input/touchscreen/tsc2007.c b/trunk/drivers/input/touchscreen/tsc2007.c
index 75fbd753a4d2..8105bf640151 100644
--- a/trunk/drivers/input/touchscreen/tsc2007.c
+++ b/trunk/drivers/input/touchscreen/tsc2007.c
@@ -295,7 +295,8 @@ static int __devinit tsc2007_probe(struct i2c_client *client,
 	input_set_abs_params(input_dev, ABS_Y, 0, MAX_12BIT, 0, 0);
 	input_set_abs_params(input_dev, ABS_PRESSURE, 0, MAX_12BIT, 0, 0);
 
-	pdata->init_platform_hw();
+	if (pdata->init_platform_hw)
+		pdata->init_platform_hw();
 
 	err = request_irq(ts->irq, tsc2007_irq, 0,
 			client->dev.driver->name, ts);
@@ -316,7 +317,8 @@ static int __devinit tsc2007_probe(struct i2c_client *client,
 
  err_free_irq:
 	tsc2007_free_irq(ts);
-	pdata->exit_platform_hw();
+	if (pdata->exit_platform_hw)
+		pdata->exit_platform_hw();
  err_free_mem:
 	input_free_device(input_dev);
 	kfree(ts);
@@ -330,7 +332,8 @@ static int __devexit tsc2007_remove(struct i2c_client *client)
 
 	tsc2007_free_irq(ts);
 
-	pdata->exit_platform_hw();
+	if (pdata->exit_platform_hw)
+		pdata->exit_platform_hw();
 
 	input_unregister_device(ts->input);
 	kfree(ts);