|
@@ -277,6 +277,9 @@ int gpiochip_add(struct gpio_chip *chip)
|
|
|
|
|
|
spin_unlock_irqrestore(&gpio_lock, flags);
|
|
|
|
|
|
+ if (status)
|
|
|
+ goto fail;
|
|
|
+
|
|
|
#ifdef CONFIG_PINCTRL
|
|
|
INIT_LIST_HEAD(&chip->pin_ranges);
|
|
|
#endif
|
|
@@ -284,12 +287,12 @@ int gpiochip_add(struct gpio_chip *chip)
|
|
|
of_gpiochip_add(chip);
|
|
|
acpi_gpiochip_add(chip);
|
|
|
|
|
|
- if (status)
|
|
|
- goto fail;
|
|
|
-
|
|
|
status = gpiochip_export(chip);
|
|
|
- if (status)
|
|
|
+ if (status) {
|
|
|
+ acpi_gpiochip_remove(chip);
|
|
|
+ of_gpiochip_remove(chip);
|
|
|
goto fail;
|
|
|
+ }
|
|
|
|
|
|
pr_debug("%s: registered GPIOs %d to %d on device: %s\n", __func__,
|
|
|
chip->base, chip->base + chip->ngpio - 1,
|