bcma: Fail probe if GPIO subdriver fails

We currently register the BCMA core even if the GPIO portions
fail. There is no reason for this: the GPIO should register
just fine, if it fails the BCMA driver should fail.

We already gracefully handle the case where the GPIO driver is
not compiled in.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20221028093000.239020-1-linus.walleij@linaro.org

diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index 44392b624b200c01b69a84d1ea4f3e5b0e686ab6..0a8469e0b13adf56d6dc1a24df0635c04ebf4c27 100644 (file)
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
@@ -344,8 +344,10 @@ static int bcma_register_devices(struct bcma_bus *bus)
        err = bcma_gpio_init(&bus->drv_cc);
        if (err == -ENOTSUPP)
                bcma_debug(bus, "GPIO driver not activated\n");
-       else if (err)
+       else if (err) {
                bcma_err(bus, "Error registering GPIO driver: %i\n", err);
+               return err;
+       }
 
        if (bus->hosttype == BCMA_HOSTTYPE_SOC) {
                err = bcma_chipco_watchdog_register(&bus->drv_cc);