diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-26 20:39:02 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-26 20:39:02 +0000 |
| commit | 75ff9420448e7bb30ab8265463595e794ce0c3aa (patch) | |
| tree | ea00f0cff2f6a272d60a518eb6dde6e14263b5b7 /drivers/input/misc/soc_button_array.c | |
| parent | 4524df83c7fc4f44702099a2db7b3cc938eb111f (diff) | |
| parent | 206c5f60a3d902bc4b56dab2de3e88de5eb06108 (diff) | |
Merge tag 'v3.18-rc4' into regulator-max77686
Linux 3.18-rc4
Diffstat (limited to 'drivers/input/misc/soc_button_array.c')
| -rw-r--r-- | drivers/input/misc/soc_button_array.c | 2 |
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); |