diff options
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/base.c | 2 | ||||
| -rw-r--r-- | drivers/of/fdt.c | 9 | ||||
| -rw-r--r-- | drivers/of/of_mdio.c | 1 |
3 files changed, 8 insertions, 4 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c index a641b1faf057..a88387bc0ac1 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -2113,7 +2113,7 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align)) continue; /* Allocate an alias_prop with enough space for the stem */ - ap = dt_alloc(sizeof(*ap) + len + 1, 4); + ap = dt_alloc(sizeof(*ap) + len + 1, __alignof__(*ap)); if (!ap) continue; memset(ap, 0, sizeof(*ap) + len + 1); diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index c9b5cac03b36..82967b07f7be 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -738,9 +738,12 @@ int __init of_scan_flat_dt(int (*it)(unsigned long node, const char *pathp; int offset, rc = 0, depth = -1; - for (offset = fdt_next_node(blob, -1, &depth); - offset >= 0 && depth >= 0 && !rc; - offset = fdt_next_node(blob, offset, &depth)) { + if (!blob) + return 0; + + for (offset = fdt_next_node(blob, -1, &depth); + offset >= 0 && depth >= 0 && !rc; + offset = fdt_next_node(blob, offset, &depth)) { pathp = fdt_get_name(blob, offset, NULL); if (*pathp == '/') diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c index 262281bd68fa..0b2979816dbf 100644 --- a/drivers/of/of_mdio.c +++ b/drivers/of/of_mdio.c @@ -147,6 +147,7 @@ EXPORT_SYMBOL(of_mdio_parse_addr); */ static const struct of_device_id whitelist_phys[] = { { .compatible = "brcm,40nm-ephy" }, + { .compatible = "broadcom,bcm5241" }, { .compatible = "marvell,88E1111", }, { .compatible = "marvell,88e1116", }, { .compatible = "marvell,88e1118", }, |