diff options
| author | Grant Likely <grant.likely@linaro.org> | 2014-11-24 14:50:07 +0000 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2014-11-24 14:50:07 +0000 |
| commit | 66e6a5a1fcd2f3e05f4d499b539a1f77ceb52d1d (patch) | |
| tree | d72f980f64b88ea4e976215a503fcb038e02f981 /drivers/of/fdt.c | |
| parent | 2d0747c4b68be8eb8ccfa2c538f2f5dd2ea89094 (diff) | |
| parent | 5d01410fe4d92081f349b013a2e7a95429e4f2c9 (diff) | |
| download | linux-66e6a5a1fcd2f3e05f4d499b539a1f77ceb52d1d.tar.bz2 | |
Merge tag 'v3.18-rc6' into devicetree/next
v3.18-rc6 contains an important DT bug fix, c1a2086e2d, "of/selftest:
Fix off-by-one error in removal path" which affects testing of the
overlay patch series. Merge it into the devicetree/next staging branch
so that the overlay patches are applied on top of a known working tree.
Linux 3.18-rc6
Conflicts:
drivers/of/address.c
Diffstat (limited to 'drivers/of/fdt.c')
| -rw-r--r-- | drivers/of/fdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index cb19adfb3933..7f6ee31d5650 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -775,7 +775,7 @@ int __init early_init_dt_scan_chosen_serial(void) if (offset < 0) return -ENODEV; - while (match->compatible) { + while (match->compatible[0]) { unsigned long addr; if (fdt_node_check_compatible(fdt, offset, match->compatible)) { match++; |