mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 17:18:59 +00:00
7d7aa2fd92
This change makes the names of Broadcom targets consistent by using the common notation based on SoC/CPU ID (which is used internally anyway), bcmXXXX instead of brcmXXXX. This is even used for target TITLE in make menuconfig already, only the short target name used brcm so far. Despite, since subtargets range from bcm2708 to bcm2711, it seems appropriate to use bcm27xx instead of bcm2708 (again, as already done for BOARDNAME). This also renames the packages brcm2708-userland and brcm2708-gpu-fw. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Acked-by: Álvaro Fernández Rojas <noltari@gmail.com>
36 lines
939 B
Diff
36 lines
939 B
Diff
From 2e2f57e09e1ace18ae01a87d9fc4378c96c54370 Mon Sep 17 00:00:00 2001
|
|
From: Lukas Wunner <lukas@wunner.de>
|
|
Date: Tue, 22 Jan 2019 12:29:45 +0100
|
|
Subject: [PATCH] bcm2835-mmc: Handle mmc_add_host() errors
|
|
|
|
The BCM2835 MMC host driver calls mmc_add_host() but doesn't check its
|
|
return value. Errors occurring in that function are therefore not
|
|
handled. Fix it.
|
|
|
|
Signed-off-by: Lukas Wunner <lukas@wunner.de>
|
|
Cc: Frank Pavlic <f.pavlic@kunbus.de>
|
|
---
|
|
drivers/mmc/host/bcm2835-mmc.c | 8 +++++++-
|
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/mmc/host/bcm2835-mmc.c
|
|
+++ b/drivers/mmc/host/bcm2835-mmc.c
|
|
@@ -1398,10 +1398,16 @@ static int bcm2835_mmc_add_host(struct b
|
|
}
|
|
|
|
mmiowb();
|
|
- mmc_add_host(mmc);
|
|
+ ret = mmc_add_host(mmc);
|
|
+ if (ret) {
|
|
+ dev_err(dev, "could not add MMC host\n");
|
|
+ goto free_irq;
|
|
+ }
|
|
|
|
return 0;
|
|
|
|
+free_irq:
|
|
+ free_irq(host->irq, host);
|
|
untasklet:
|
|
tasklet_kill(&host->finish_tasklet);
|
|
|