From d1a0ac4cfd08bc7c1f73babb4df171fcc245da73 Mon Sep 17 00:00:00 2001 From: Haojian Zhuang Date: Fri, 7 Jun 2013 11:17:07 +0800 Subject: [PATCH] --- yaml --- r: 377149 b: refs/heads/master c: 7e5955db458b2d349a8180242afebc78a13ed023 h: refs/heads/master i: 377147: e0ab7ae11197be639ef1cdce5aa9e01505ee2526 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-prima2/pm.c | 6 ++++-- trunk/arch/arm/mach-prima2/rstc.c | 6 ++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e1cfef0c4016..2f05d96b0bc0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f1d6e31de103a573064a7ff158a8de0170f8fe34 +refs/heads/master: 7e5955db458b2d349a8180242afebc78a13ed023 diff --git a/trunk/arch/arm/mach-prima2/pm.c b/trunk/arch/arm/mach-prima2/pm.c index 9936c180bf01..8f595c0cc8d9 100644 --- a/trunk/arch/arm/mach-prima2/pm.c +++ b/trunk/arch/arm/mach-prima2/pm.c @@ -101,8 +101,10 @@ static int __init sirfsoc_of_pwrc_init(void) struct device_node *np; np = of_find_matching_node(NULL, pwrc_ids); - if (!np) - panic("unable to find compatible pwrc node in dtb\n"); + if (!np) { + pr_err("unable to find compatible sirf pwrc node in dtb\n"); + return -ENOENT; + } /* * pwrc behind rtciobrg is not located in memory space diff --git a/trunk/arch/arm/mach-prima2/rstc.c b/trunk/arch/arm/mach-prima2/rstc.c index 435019ca0a48..d5e0cbc934c0 100644 --- a/trunk/arch/arm/mach-prima2/rstc.c +++ b/trunk/arch/arm/mach-prima2/rstc.c @@ -28,8 +28,10 @@ static int __init sirfsoc_of_rstc_init(void) struct device_node *np; np = of_find_matching_node(NULL, rstc_ids); - if (!np) - panic("unable to find compatible rstc node in dtb\n"); + if (!np) { + pr_err("unable to find compatible sirf rstc node in dtb\n"); + return -ENOENT; + } sirfsoc_rstc_base = of_iomap(np, 0); if (!sirfsoc_rstc_base)