[PATCH] touchscreen: tsc2007.c x_plat_ohms must be > 0 for touch to work

[PATCH] touchscreen: tsc2007.c x_plat_ohms must be > 0 for touch to work

[Philip Rakity]

Touch events are not processed unless pressure > 0.
x_plat_ohms is used in pressure calculation.  ensure driver
will not start if zero value and indicate reason why there is
a failure

Signed-off-by: Philip Rakity <prakity@marvell.com>
---
 drivers/input/touchscreen/tsc2007.c |    6 ++++++
 include/linux/i2c/tsc2007.h         |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/drivers/input/touchscreen/tsc2007.c b/drivers/input/touchscreen/tsc2007.c
index 0acca68..628261b 100644
--- a/drivers/input/touchscreen/tsc2007.c
+++ b/drivers/input/touchscreen/tsc2007.c
@@ -310,6 +310,12 @@ static int __devinit tsc2007_probe(struct i2c_client *client,
 	ts->get_pendown_state = pdata->get_pendown_state;
 	ts->clear_penirq      = pdata->clear_penirq;
 
+	if (pdata->x_plate_ohms == 0) {
+		dev_err(&client->dev, "pdata->x_plate_ohms must be > 0");
+		err = -EINVAL;
+		goto err_free_mem;
+	}
+
 	snprintf(ts->phys, sizeof(ts->phys),
 		 "%s/input0", dev_name(&client->dev));
 
diff --git a/include/linux/i2c/tsc2007.h b/include/linux/i2c/tsc2007.h
index 591427a..506a9f7 100644
--- a/include/linux/i2c/tsc2007.h
+++ b/include/linux/i2c/tsc2007.h
@@ -5,7 +5,7 @@
 
 struct tsc2007_platform_data {
 	u16	model;				/* 2007. */
-	u16	x_plate_ohms;
+	u16	x_plate_ohms;	/* must be non-zero value */
 	u16	max_rt; /* max. resistance above which samples are ignored */
 	unsigned long poll_delay; /* delay (in ms) after pen-down event
 				     before polling starts */
-- 
1.7.6

Re: [PATCH] touchscreen: tsc2007.c x_plat_ohms must be > 0 for touch to work

[Dmitry Torokhov]

On Tue, Oct 11, 2011 at 02:28:05PM -0700, Philip Rakity wrote:
> Touch events are not processed unless pressure > 0.
> x_plat_ohms is used in pressure calculation.  ensure driver
> will not start if zero value and indicate reason why there is
> a failure
> 
> Signed-off-by: Philip Rakity <prakity@marvell.com>

Applied, thanks Philip.

-- 
Dmitry