Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 137365
b: refs/heads/master
c: 7aec53a
h: refs/heads/master
i:
  137363: 401cfa3
v: v3
  • Loading branch information
Russell King authored and Russell King committed Feb 23, 2009
1 parent d0e6125 commit 6c0dacc
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7eb1afc9765d07c9036b1ad9e7c03e5bd1a58a2b
refs/heads/master: 7aec53acc0504ab2abd73a6051e7b72f48545ceb
13 changes: 5 additions & 8 deletions trunk/arch/arm/mach-omap2/clockdomain.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

/*
Expand Down Expand Up @@ -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;
Expand All @@ -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);

Expand Down

0 comments on commit 6c0dacc

Please sign in to comment.