Merge commit 'v2.6.30' into next

[cascardo/linux.git] / drivers / input / touchscreen / tsc2007.c

diff --git a/drivers/input/touchscreen/tsc2007.c b/drivers/input/touchscreen/tsc2007.c
index 948e167..880f58c 100644 (file)
--- a/drivers/input/touchscreen/tsc2007.c
+++ b/drivers/input/touchscreen/tsc2007.c
@@ -257,7 +257,7 @@ static int tsc2007_probe(struct i2c_client *client,
        struct input_dev *input_dev;
        int err;
 
-       if (!pdata) {
+       if (!pdata || !pdata->get_pendown_state) {
                dev_err(&client->dev, "platform data is required!\n");
                return -EINVAL;
        }