diff options
| author | Rajendra Nayak <rnayak@ti.com> | 2013-12-02 20:38:14 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-12-02 20:38:14 +0100 |
| commit | 1cfc4bdd51970ac07c9eea545e65a3b16dc269b6 (patch) | |
| tree | 7ff5719fec95336d3327a2164afa658c913c4bd7 /arch/arm/mach-omap2 | |
| parent | ARM: dts: omap3-beagle: Add omap-twl4030 audio support (diff) | |
| download | linux-1cfc4bdd51970ac07c9eea545e65a3b16dc269b6.tar.xz linux-1cfc4bdd51970ac07c9eea545e65a3b16dc269b6.zip | |
ARM: OMAP2+: Powerdomain: Fix unchecked dereference of arch_pwrdm
Commit 'cd8abed' "ARM: OMAP2+: Powerdomain: Remove the need to
always have a voltdm associated to a pwrdm" leads to the following
Smatch complaint:
arch/arm/mach-omap2/powerdomain.c:131 _pwrdm_register()
error: we previously assumed 'arch_pwrdm' could be null (see line 105)
So, fix the unchecked dereference of arch_pwrdm.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/powerdomain.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/mach-omap2/powerdomain.c index e233dfcbc186..93a2a6e4260f 100644 --- a/arch/arm/mach-omap2/powerdomain.c +++ b/arch/arm/mach-omap2/powerdomain.c @@ -128,7 +128,8 @@ skip_voltdm: for (i = 0; i < pwrdm->banks; i++) pwrdm->ret_mem_off_counter[i] = 0; - arch_pwrdm->pwrdm_wait_transition(pwrdm); + if (arch_pwrdm && arch_pwrdm->pwrdm_wait_transition) + arch_pwrdm->pwrdm_wait_transition(pwrdm); pwrdm->state = pwrdm_read_pwrst(pwrdm); pwrdm->state_counter[pwrdm->state] = 1; |