From 8a981a7b4754c0179c59ba1dbff1daeb790214e6 Mon Sep 17 00:00:00 2001 From: Igor Grinberg Date: Wed, 11 May 2011 15:45:05 -0700 Subject: [PATCH] --- yaml --- r: 250509 b: refs/heads/master c: 1201e7e67634624aec89317cf308cd0d3d8d4770 h: refs/heads/master i: 250507: 7d840b6555884c3f3962c61e0d6cbb841f8d8d78 v: v3 --- [refs] | 2 +- trunk/drivers/input/touchscreen/ads7846.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e759c18204b2..a666257ace85 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ebcaaad9d5e8fd284b8dcf25a24999420f0f56d8 +refs/heads/master: 1201e7e67634624aec89317cf308cd0d3d8d4770 diff --git a/trunk/drivers/input/touchscreen/ads7846.c b/trunk/drivers/input/touchscreen/ads7846.c index e4ee43e159d2..beb754ff931b 100644 --- a/trunk/drivers/input/touchscreen/ads7846.c +++ b/trunk/drivers/input/touchscreen/ads7846.c @@ -966,6 +966,13 @@ static int __devinit ads7846_setup_pendown(struct spi_device *spi, struct ads784 pdata->gpio_pendown); return err; } + err = gpio_direction_input(pdata->gpio_pendown); + if (err) { + dev_err(&spi->dev, "failed to setup pendown GPIO%d\n", + pdata->gpio_pendown); + gpio_free(pdata->gpio_pendown); + return err; + } ts->gpio_pendown = pdata->gpio_pendown;