From 6c0dacc3a9cc07b41f835edee9ee7c1537e8a1a8 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 22 Feb 2009 21:00:55 +0000 Subject: [PATCH] --- yaml --- r: 137365 b: refs/heads/master c: 7aec53acc0504ab2abd73a6051e7b72f48545ceb h: refs/heads/master i: 137363: 401cfa38ccc3df246df56027a06980910b6957f1 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/clockdomain.c | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index c4e12f453a7d..d537725a4c02 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7eb1afc9765d07c9036b1ad9e7c03e5bd1a58a2b +refs/heads/master: 7aec53acc0504ab2abd73a6051e7b72f48545ceb diff --git a/trunk/arch/arm/mach-omap2/clockdomain.c b/trunk/arch/arm/mach-omap2/clockdomain.c index ae0c53abb55a..0e7d501865b6 100644 --- a/trunk/arch/arm/mach-omap2/clockdomain.c +++ b/trunk/arch/arm/mach-omap2/clockdomain.c @@ -74,14 +74,11 @@ static void _autodep_lookup(struct clkdm_pwrdm_autodep *autodep) pwrdm = pwrdm_lookup(autodep->pwrdm.name); if (!pwrdm) { - pr_debug("clockdomain: _autodep_lookup: powerdomain %s " - "does not exist\n", autodep->pwrdm.name); - WARN_ON(1); + pr_err("clockdomain: autodeps: powerdomain %s does not exist\n", + autodep->pwrdm.name); pwrdm = ERR_PTR(-ENOENT); } autodep->pwrdm.ptr = pwrdm; - - return; } /* @@ -211,8 +208,8 @@ int clkdm_register(struct clockdomain *clkdm) pwrdm = pwrdm_lookup(clkdm->pwrdm.name); if (!pwrdm) { - pr_debug("clockdomain: clkdm_register %s: powerdomain %s " - "does not exist\n", clkdm->name, clkdm->pwrdm.name); + pr_err("clockdomain: %s: powerdomain %s does not exist\n", + clkdm->name, clkdm->pwrdm.name); return -EINVAL; } clkdm->pwrdm.ptr = pwrdm; @@ -222,7 +219,7 @@ int clkdm_register(struct clockdomain *clkdm) if (_clkdm_lookup(clkdm->name)) { ret = -EEXIST; goto cr_unlock; - }; + } list_add(&clkdm->node, &clkdm_list);