diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2022-10-28 11:30:00 +0200 |
|---|---|---|
| committer | Kalle Valo <kvalo@kernel.org> | 2022-11-04 12:59:51 +0200 |
| commit | 74a473007ce54b1f42267cf13e008abfb1849ad0 (patch) | |
| tree | 4adbc299bd079a8a94097b55af65c34bd7fa05ec | |
| parent | 2b6c0e152868c9c5939a5c5094d5b2be61cf48e6 (diff) | |
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
| -rw-r--r-- | drivers/bcma/main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c index 44392b624b20..0a8469e0b13a 100644 --- 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); |