diff options
| author | Nishanth Menon <nm@ti.com> | 2012-08-01 20:52:03 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2012-08-01 20:52:03 +0800 |
| commit | d558097d4b4bf0ba250bde1dc19a634f015227ba (patch) | |
| tree | b5a8c16b222b4b70028ba8c917bcfe4d7a01c80a | |
| parent | 0b8ff05e6f463c728cdd91fed0a15d4344a6ecb3 (diff) | |
OMAP3+: PM: VP: dereference voltdm after checking valid voltdm
voltdm should be dereferenced only after voltdm has been checked
for NULL parameters.
Change-Id: I61792933b6a33121dc2e7855e6c0b75f24a0d03b
Reported-by; Hoon Heo <ryan.heo@samsung.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Conflicts:
arch/arm/mach-omap2/vp.c
Signed-off-by: Sebastien Jan <s-jan@ti.com>
| -rw-r--r-- | arch/arm/mach-omap2/vp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/vp.c b/arch/arm/mach-omap2/vp.c index f221df57471..2481ed50dd1 100644 --- a/arch/arm/mach-omap2/vp.c +++ b/arch/arm/mach-omap2/vp.c @@ -18,7 +18,7 @@ */ unsigned long omap_vp_get_curr_volt(struct voltagedomain *voltdm) { - struct omap_vp_instance *vp = voltdm->vp; + struct omap_vp_instance *vp; u8 curr_vsel; if (IS_ERR_OR_NULL(voltdm)) { @@ -32,6 +32,8 @@ unsigned long omap_vp_get_curr_volt(struct voltagedomain *voltdm) return 0; } + vp = voltdm->vp; + curr_vsel = (voltdm->read(vp->voltage) & vp->common->vpvoltage_mask) >> __ffs(vp->common->vpvoltage_mask); |