diff options
| author |   Linus Walleij <linus.walleij@linaro.org> | 2019-09-06 12:05:35 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2019-09-06 12:05:35 +0200 |
| commit | fbdf8d4bef4917713e7ec2fc006041a2b449605a (patch) | |
| tree | b56dab8ee777bfd8a40001eaab25cb0cd5695f86 /drivers/gpio | |
| parent | Merge tag 'v5.3-rc7' into devel (diff) | |
| download | linux-dev-fbdf8d4bef4917713e7ec2fc006041a2b449605a.tar.xz linux-dev-fbdf8d4bef4917713e7ec2fc006041a2b449605a.zip | |
gpio: Fix further merge errors
The previous merge of v5.3-rc7 was struggle enough, now it
gave rise to new errors and now I fix those too.
Fixes: 151a41014bff ("Merge tag 'v5.3-rc7' into devel")
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpiolib.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 5b351f87c50a..56d0898d94aa 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1399,12 +1399,12 @@ int gpiochip_add_data_with_key(struct gpio_chip *chip, void *data, machine_gpiochip_add(chip); - status = gpiochip_irqchip_init_valid_mask(chip); - if (status) + ret = gpiochip_irqchip_init_valid_mask(chip); + if (ret) goto err_remove_acpi_chip; - status = gpiochip_add_irqchip(chip, lock_key, request_key); - if (status) + ret = gpiochip_add_irqchip(chip, lock_key, request_key); + if (ret) goto err_remove_irqchip_mask; /* |