diff options
| author | Tony Lindgren | 2009-09-03 19:17:39 +0200 |
|---|---|---|
| committer | Tony Lindgren | 2009-09-03 19:17:39 +0200 |
| commit | 1f685b36dbf27db55072fb738aac57aaf37d2c71 (patch) | |
| tree | 43cdcd1288d3bfa042a7cd6a89d2bf40f9b0261e /arch/arm/mach-omap2/powerdomain.c | |
| parent | Merge branch 'pm-upstream/debug' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | OMAP clock: use debugfs_remove_recursive() for rewinding (diff) | |
| download | kernel-qcow2-linux-1f685b36dbf27db55072fb738aac57aaf37d2c71.tar.gz kernel-qcow2-linux-1f685b36dbf27db55072fb738aac57aaf37d2c71.tar.xz kernel-qcow2-linux-1f685b36dbf27db55072fb738aac57aaf37d2c71.zip | |
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 5a6cef3e42bf..2594cbff3947 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; |