From b0e6a2ea05ec3120ffbcd7830d8bed41bd00a463 Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Thu, 29 Nov 2012 09:24:08 -0800 Subject: [PATCH] --- yaml --- r: 346978 b: refs/heads/master c: da5ee074ce8e07b9a91596de3576b59990c0c8c6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/keyboard/gpio_keys_polled.c | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 157399315044..8cc11a14ca58 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 333e34bfe2149e634fb0613b4936fd838c36fafb +refs/heads/master: da5ee074ce8e07b9a91596de3576b59990c0c8c6 diff --git a/trunk/drivers/input/keyboard/gpio_keys_polled.c b/trunk/drivers/input/keyboard/gpio_keys_polled.c index d72d0e5ebb85..f686fd970553 100644 --- a/trunk/drivers/input/keyboard/gpio_keys_polled.c +++ b/trunk/drivers/input/keyboard/gpio_keys_polled.c @@ -270,22 +270,14 @@ static int gpio_keys_polled_probe(struct platform_device *pdev) goto err_free_gpio; } - error = gpio_request(gpio, - button->desc ? button->desc : DRV_NAME); + error = gpio_request_one(gpio, GPIOF_IN, + button->desc ?: DRV_NAME); if (error) { dev_err(dev, "unable to claim gpio %u, err=%d\n", gpio, error); goto err_free_gpio; } - error = gpio_direction_input(gpio); - if (error) { - dev_err(dev, - "unable to set direction on gpio %u, err=%d\n", - gpio, error); - goto err_free_gpio; - } - bdata->can_sleep = gpio_cansleep(gpio); bdata->last_state = -1; bdata->threshold = DIV_ROUND_UP(button->debounce_interval,