From fdc1f15d6823b7ce03fddac89c688df57d154f71 Mon Sep 17 00:00:00 2001 From: Igor Grinberg Date: Mon, 27 Jun 2011 13:06:27 -0700 Subject: [PATCH] --- yaml --- r: 260754 b: refs/heads/master c: 58c244009ef6ca450f0d787828a7f2f27651db5b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/touchscreen/ads7846.c | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 7d6796ad2fd9..fe3eb12608e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 11d0cf8859451d6336959204b2d4cc173dd1aa4e +refs/heads/master: 58c244009ef6ca450f0d787828a7f2f27651db5b diff --git a/trunk/drivers/input/touchscreen/ads7846.c b/trunk/drivers/input/touchscreen/ads7846.c index 5196861b86ef..d507b9b67806 100644 --- a/trunk/drivers/input/touchscreen/ads7846.c +++ b/trunk/drivers/input/touchscreen/ads7846.c @@ -967,17 +967,12 @@ static int __devinit ads7846_setup_pendown(struct spi_device *spi, struct ads784 ts->get_pendown_state = pdata->get_pendown_state; } else if (gpio_is_valid(pdata->gpio_pendown)) { - err = gpio_request(pdata->gpio_pendown, "ads7846_pendown"); + err = gpio_request_one(pdata->gpio_pendown, GPIOF_IN, + "ads7846_pendown"); if (err) { - dev_err(&spi->dev, "failed to request pendown GPIO%d\n", - 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); + dev_err(&spi->dev, + "failed to request/setup pendown GPIO%d: %d\n", + pdata->gpio_pendown, err); return err; }