From 1ad2e684360643d7c951d45d214299b6d57e5749 Mon Sep 17 00:00:00 2001 From: Philip Rakity Date: Tue, 11 Oct 2011 20:54:55 -0700 Subject: [PATCH] --- yaml --- r: 269509 b: refs/heads/master c: 341deefe8f4584b09564193cb46d8cf386f491a5 h: refs/heads/master i: 269507: 13da601c64e56f244d0b4876a0e68ab106eac821 v: v3 --- [refs] | 2 +- trunk/drivers/input/touchscreen/tsc2007.c | 6 ++++++ trunk/include/linux/i2c/tsc2007.h | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7f8bf17e6a6e..a68d9143be11 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 550eca7cafa1c6e2c077afb2211a364a982d8645 +refs/heads/master: 341deefe8f4584b09564193cb46d8cf386f491a5 diff --git a/trunk/drivers/input/touchscreen/tsc2007.c b/trunk/drivers/input/touchscreen/tsc2007.c index 0acca68cc52b..1f674cb6c55b 100644 --- a/trunk/drivers/input/touchscreen/tsc2007.c +++ b/trunk/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, "x_plate_ohms is not set up in platform data"); + err = -EINVAL; + goto err_free_mem; + } + snprintf(ts->phys, sizeof(ts->phys), "%s/input0", dev_name(&client->dev)); diff --git a/trunk/include/linux/i2c/tsc2007.h b/trunk/include/linux/i2c/tsc2007.h index 591427a63b06..506a9f7af51e 100644 --- a/trunk/include/linux/i2c/tsc2007.h +++ b/trunk/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 */