]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Input: soc_button_array - use gpio_is_valid()
authorBenjamin Tissoires <benjamin.tissoires@redhat.com>
Fri, 25 Nov 2016 19:20:43 +0000 (11:20 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 25 Nov 2016 19:39:49 +0000 (11:39 -0800)
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>
drivers/input/misc/soc_button_array.c

index c14b82709b0f09481c7fc6c8c52c0e384dd33da1..bbd433c4a5aa96618345910d364509d436d9221c 100644 (file)
@@ -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;