diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-09-03 10:17:39 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-09-03 10:17:39 -0700 |
| commit | 1f685b36dbf27db55072fb738aac57aaf37d2c71 (patch) | |
| tree | 43cdcd1288d3bfa042a7cd6a89d2bf40f9b0261e /arch/arm/mach-omap2/powerdomain.c | |
| parent | 5567fa1f543dde3c42f8e52bf4f7005135b24896 (diff) | |
| parent | ca4caa4e1d45f9542fa54263974d0ef637157b4a (diff) | |
Merge branch '2_6_32_for_next' of git://git.pwsan.com/linux-2.6 into for-next
Diffstat (limited to 'arch/arm/mach-omap2/powerdomain.c')
| -rw-r--r-- | arch/arm/mach-omap2/powerdomain.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/mach-omap2/powerdomain.c index 5a6cef3e42b..2594cbff394 100644 --- a/arch/arm/mach-omap2/powerdomain.c +++ b/arch/arm/mach-omap2/powerdomain.c @@ -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; |