]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
gpiolib: acpi: Don't contaminate return parameter in case of error
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Fri, 10 Nov 2017 13:40:29 +0000 (15:40 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Thu, 30 Nov 2017 09:53:50 +0000 (10:53 +0100)
If error occurs, leave lookup parameter untouched.

There is no functional change, since all current callers just bail out
in case of error without using the assigned pieces.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/gpio/gpiolib-acpi.c

index 2a85d27eb02809999bd94cb0c632a29f7cd63871..f640445099ab6d37b13d2e3622d6911595b4f981 100644 (file)
@@ -585,7 +585,6 @@ static int acpi_gpio_property_lookup(struct fwnode_handle *fwnode,
         * The property was found and resolved, so need to lookup the GPIO based
         * on returned args.
         */
-       lookup->adev = args.adev;
        if (args.nargs != 3)
                return -EPROTO;
 
@@ -593,6 +592,7 @@ static int acpi_gpio_property_lookup(struct fwnode_handle *fwnode,
        lookup->pin_index = args.args[1];
        lookup->active_low = !!args.args[2];
 
+       lookup->adev = args.adev;
        return 0;
 }