| commit | f0df145c08dd1580a669742e7c91bf1b9df77798 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Tue Oct 16 18:34:07 2012 -0700 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Tue Oct 16 18:34:04 2012 -0700 |
| tree | bd384dd501bef17253a8eb7816f0af25f165baab | |
| parent | b1d88dd3fa7d544433e2bb2f25a8294f51ddfb43 [diff] | |
| parent | a548ca060b8d15afa1782703a9e74a82c74967b7 [diff] |
Merge "msm: clock-local: Avoid potential NULL dereference in branch_disable_reg()"
diff --git a/arch/arm/mach-msm/clock-local.c b/arch/arm/mach-msm/clock-local.c index ca031ad..d2260cb 100644 --- a/arch/arm/mach-msm/clock-local.c +++ b/arch/arm/mach-msm/clock-local.c
@@ -352,7 +352,7 @@ u32 reg_val; reg_val = b->ctl_reg ? readl_relaxed(b->ctl_reg) : 0; - if (b->en_mask) { + if (b->ctl_reg && b->en_mask) { reg_val &= ~(b->en_mask); writel_relaxed(reg_val, b->ctl_reg); }