diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2017-02-20 17:15:49 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2017-03-16 21:52:12 +0100 |
| commit | c5097538c86a60c655f7fac33dfd565d22909dae (patch) | |
| tree | 1c62c287270755afe48876feff86ec951340d989 /drivers/input | |
| parent | platform/x86: surface3_button: Propagate error from gpiod_count() (diff) | |
| download | linux-c5097538c86a60c655f7fac33dfd565d22909dae.tar.xz linux-c5097538c86a60c655f7fac33dfd565d22909dae.zip | |
Input: soc_button_array - Propagate error from gpiod_count()
Since gpiod_count() does not return 0 anymore, we don't need to shadow
its error code and would safely propagate to the user.
While here, replace second parameter by NULL in order to prevent side
effects on _DSD enabled firmware.
Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/misc/soc_button_array.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c index ddb2f22fca7a..c3b8e1fb4699 100644 --- a/drivers/input/misc/soc_button_array.c +++ b/drivers/input/misc/soc_button_array.c @@ -169,9 +169,10 @@ static int soc_button_probe(struct platform_device *pdev) button_info = (struct soc_button_info *)id->driver_data; - if (gpiod_count(dev, KBUILD_MODNAME) <= 0) { + error = gpiod_count(dev, NULL); + if (error < 0) { dev_dbg(dev, "no GPIO attached, ignoring...\n"); - return -ENODEV; + return error; } priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); |