From cb1d92474c99fe616e5a52fb15018b55b7eabb94 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Mon, 1 Feb 2010 21:34:14 -0700 Subject: [PATCH] --- yaml --- r: 180937 b: refs/heads/master c: 36b9d3070d653af5807cef74ff129721d9047107 h: refs/heads/master i: 180935: 22e363851f1c1666d83650ef1433414d706176ac v: v3 --- [refs] | 2 +- trunk/drivers/of/fdt.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bb09da5a77c6..8f5840fc708b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1406bc2f57787797d1f6a3675c019a7093769275 +refs/heads/master: 36b9d3070d653af5807cef74ff129721d9047107 diff --git a/trunk/drivers/of/fdt.c b/trunk/drivers/of/fdt.c index 9290ca5aa892..56fbd6e3122a 100644 --- a/trunk/drivers/of/fdt.c +++ b/trunk/drivers/of/fdt.c @@ -420,11 +420,11 @@ int __init early_init_dt_scan_root(unsigned long node, const char *uname, return 0; prop = of_get_flat_dt_prop(node, "#size-cells", NULL); - dt_root_size_cells = (prop == NULL) ? 1 : *prop; + dt_root_size_cells = prop ? *prop : OF_ROOT_NODE_SIZE_CELLS_DEFAULT; pr_debug("dt_root_size_cells = %x\n", dt_root_size_cells); prop = of_get_flat_dt_prop(node, "#address-cells", NULL); - dt_root_addr_cells = (prop == NULL) ? 2 : *prop; + dt_root_addr_cells = prop ? *prop : OF_ROOT_NODE_ADDR_CELLS_DEFAULT; pr_debug("dt_root_addr_cells = %x\n", dt_root_addr_cells); /* break now */