summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorAlexandre Courbot <acourbot@nvidia.com>2014-10-23 17:53:13 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-10-24 23:54:44 +0200
commit4668546f99df6413be19d370c448c6b4b37fb5bc (patch)
tree7f1cdf6cc82e4a6127524713793ec12ad21da6c3 /drivers/input
parentInput: xpad - add Thrustmaster as Xbox 360 controller vendor (diff)
downloadlinux-4668546f99df6413be19d370c448c6b4b37fb5bc.tar.xz
linux-4668546f99df6413be19d370c448c6b4b37fb5bc.zip
Input: soc_button_array - update calls to gpiod_get*()
Add the new flags argument to calls of (devm_)gpiod_get*(). Currently both forms (with or without the flags argument) are valid thanks to transitional macros in <linux/gpio/consumer.h>. These macros will be removed once all consumers are updated and the flags argument will become compulsory. Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/misc/soc_button_array.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c
index 735604753568..e097f1ab427f 100644
--- a/drivers/input/misc/soc_button_array.c
+++ b/drivers/input/misc/soc_button_array.c
@@ -55,7 +55,7 @@ static int soc_button_lookup_gpio(struct device *dev, int acpi_index)
struct gpio_desc *desc;
int gpio;
- desc = gpiod_get_index(dev, KBUILD_MODNAME, acpi_index);
+ desc = gpiod_get_index(dev, KBUILD_MODNAME, acpi_index, GPIOD_ASIS);
if (IS_ERR(desc))
return PTR_ERR(desc);