From: Igor Grinberg Date: Wed, 11 May 2011 22:45:05 +0000 (-0700) Subject: Input: ads7846 - fix gpio_pendown configuration X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1201e7e67634624aec89317cf308cd0d3d8d4770;p=linux-beck.git Input: ads7846 - fix gpio_pendown configuration The pendown gpio was requested but not configured for input. Configure it for input. Signed-off-by: Igor Grinberg Signed-off-by: Dmitry Torokhov --- diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c index e4ee43e159d2..beb754ff931b 100644 --- a/drivers/input/touchscreen/ads7846.c +++ b/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;