gpio: Fix further merge errors (fbdf8d4b) · Commits · 戴 / test

The previous merge of v5.3-rc7 was struggle enough, now it gave rise to new errors and now I fix those too. Fixes: ("Merge tag 'v5.3-rc7' into devel") Signed-off-by:

Linus Walleij <linus.walleij@linaro.org>

drivers/gpio/gpiolib.c

+4 −4

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

		/*

Admin message