[PATCH] ARM: prima2: return rather than panic on missing DT nodes
Rob Herring
robherring2 at gmail.com
Thu May 16 11:50:37 EDT 2013
From: Rob Herring <rob.herring at calxeda.com>
Missing nodes is a normal condition in multi-platform kernels when we boot
on other platforms. So remove the panic and just return if we don't find
a DT node.
Signed-off-by: Rob Herring <rob.herring at calxeda.com>
Cc: Barry Song <baohua.song at csr.com>
---
arch/arm/mach-prima2/pm.c | 2 +-
arch/arm/mach-prima2/rstc.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-prima2/pm.c b/arch/arm/mach-prima2/pm.c
index 9936c18..a8003e2 100644
--- a/arch/arm/mach-prima2/pm.c
+++ b/arch/arm/mach-prima2/pm.c
@@ -102,7 +102,7 @@ static int __init sirfsoc_of_pwrc_init(void)
np = of_find_matching_node(NULL, pwrc_ids);
if (!np)
- panic("unable to find compatible pwrc node in dtb\n");
+ return -ENODEV;
/*
* pwrc behind rtciobrg is not located in memory space
diff --git a/arch/arm/mach-prima2/rstc.c b/arch/arm/mach-prima2/rstc.c
index 435019c..6d7d9db 100644
--- a/arch/arm/mach-prima2/rstc.c
+++ b/arch/arm/mach-prima2/rstc.c
@@ -29,7 +29,7 @@ static int __init sirfsoc_of_rstc_init(void)
np = of_find_matching_node(NULL, rstc_ids);
if (!np)
- panic("unable to find compatible rstc node in dtb\n");
+ return -ENODEV;
sirfsoc_rstc_base = of_iomap(np, 0);
if (!sirfsoc_rstc_base)
--
1.8.1.2
More information about the linux-arm-kernel
mailing list