Commit c5097538 authored Feb 20, 2017 by Andy Shevchenko Committed by Linus Walleij Mar 16, 2017

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>

parent 562e7a40

drivers/input/misc/soc_button_array.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -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);

Admin message