diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2017-02-20 18:15:48 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2017-03-16 21:52:12 +0100 |
| commit | 562e7a4032d1ff33e283d7ba1d5f10fe7ea96669 (patch) | |
| tree | c501dfe72d90e884c9d6eb5128c5d4f3e6113c6c /drivers/platform/x86 | |
| parent | 4033d4a4f5236b01200010bf38928347af75d86e (diff) | |
| download | linux-stable-562e7a4032d1ff33e283d7ba1d5f10fe7ea96669.tar.gz linux-stable-562e7a4032d1ff33e283d7ba1d5f10fe7ea96669.tar.bz2 linux-stable-562e7a4032d1ff33e283d7ba1d5f10fe7ea96669.zip | |
platform/x86: surface3_button: 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>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/platform/x86')
| -rw-r--r-- | drivers/platform/x86/surface3_button.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/platform/x86/surface3_button.c b/drivers/platform/x86/surface3_button.c index 8bfd7f613d36..57f51476bb65 100644 --- a/drivers/platform/x86/surface3_button.c +++ b/drivers/platform/x86/surface3_button.c @@ -196,9 +196,10 @@ static int surface3_button_probe(struct i2c_client *client, strlen(SURFACE_BUTTON_OBJ_NAME))) return -ENODEV; - 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); |