Message ID | 1462894673-26560-2-git-send-email-benjamin.tissoires@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Tue, May 10, 2016 at 12:37 PM, Benjamin Tissoires <benjamin.tissoires@redhat.com> wrote: > @@ -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)) Shouldn't it be "if (!gpio_is_valid(gpio))" ? -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On May 10 2016 or thereabouts, Fabio Estevam wrote: > On Tue, May 10, 2016 at 12:37 PM, Benjamin Tissoires > <benjamin.tissoires@redhat.com> wrote: > > > @@ -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)) > > Shouldn't it be "if (!gpio_is_valid(gpio))" ? Oops, indeed. I messed up between the various trees as it's not that convenient to recompile a full kernel on an atom device. Will fix this in v2. Cheers, Benjamin -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c index c14b827..9cbe874 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;
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> --- drivers/input/misc/soc_button_array.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)