lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch '2_6_32_for_next' of git://git.pwsan.com/linux-2.6 into for-next

Browse Source
This commit is contained in:
Tony Lindgren
2009-09-03 10:17:39 -07:00
parent 5567fa1f54 ca4caa4e1d
commit 1f685b36db
36 changed files with 4335 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-omap2/powerdomain.c
View File

@ -90,7 +90,7 @@ static struct powerdomain *_pwrdm_deps_lookup(struct powerdomain *pwrdm,
if (!pwrdm || !deps || !omap_chip_is(pwrdm->omap_chip))
return ERR_PTR(-EINVAL);
for (pd = deps; pd; pd++) {
for (pd = deps; pd->pwrdm_name; pd++) {
if (!omap_chip_is(pd->omap_chip))
continue;
@ -103,7 +103,7 @@ static struct powerdomain *_pwrdm_deps_lookup(struct powerdomain *pwrdm,
}
if (!pd)
if (!pd->pwrdm_name)
return ERR_PTR(-ENOENT);
return pd->pwrdm;