aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/misc/soc_button_array.c
diff options
context:
space:
mode:
authorBenjamin Tissoires <benjamin.tissoires@redhat.com>2016-11-25 11:20:43 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2016-11-25 11:39:49 -0800
commitbe8e7a7ec876d509bc61af64b41b314a142aa262 (patch)
tree89c06c498434db67e991a04ecc7f0f4f538104a6 /drivers/input/misc/soc_button_array.c
parentInput: i8042 - fix typo from i8042_aux_close to i8042_port_close (diff)
downloadlinux-dev-be8e7a7ec876d509bc61af64b41b314a142aa262.tar.xz
linux-dev-be8e7a7ec876d509bc61af64b41b314a142aa262.zip
Input: soc_button_array - use gpio_is_valid()
gpio_keys will later use gpio_is_valid(). To match the actual behavior, we should use it here too. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to '')
-rw-r--r--drivers/input/misc/soc_button_array.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c
index c14b82709b0f..bbd433c4a5aa 100644
--- a/drivers/input/misc/soc_button_array.c
+++ b/drivers/input/misc/soc_button_array.c
@@ -17,6 +17,7 @@
#include <linux/acpi.h>
#include <linux/gpio/consumer.h>
#include <linux/gpio_keys.h>
+#include <linux/gpio.h>
#include <linux/platform_device.h>
/*
@@ -92,7 +93,7 @@ soc_button_device_create(struct platform_device *pdev,
continue;
gpio = soc_button_lookup_gpio(&pdev->dev, info->acpi_index);
- if (gpio < 0)
+ if (!gpio_is_valid(gpio))
continue;
gpio_keys[n_buttons].type = info->event_type;