aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorAvik Sil <avik.sil@linaro.org>2011-03-31 17:14:30 +0530
committerAvik Sil <avik.sil@linaro.org>2011-03-31 17:14:30 +0530
commit7c2f3276a5912e3aad2038f4ebaf971ff7c12dbe (patch)
treeda0f6c0bbfbdf3a9628181d6ac2553f37ffb72ab /arch/arm/mach-omap2
parentf6950887f5a6ea73b9037cdd8346deb7fdfe6ae2 (diff)
lttng: ARM trace clock fix release_pmu
Check if reserved_pmu is valid before passing it to release_pmu()
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/trace-clock.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/trace-clock.c b/arch/arm/mach-omap2/trace-clock.c
index 3db1cdb8d59..c21bd478ce0 100644
--- a/arch/arm/mach-omap2/trace-clock.c
+++ b/arch/arm/mach-omap2/trace-clock.c
@@ -565,7 +565,8 @@ void put_trace_clock(void)
if (trace_clock_refcount != 1)
goto end;
_stop_trace_clock();
- release_pmu(reserved_pmu);
+ if (!IS_ERR_OR_NULL(reserved_pmu))
+ release_pmu(reserved_pmu);
end:
trace_clock_refcount--;
spin_unlock(&trace_clock_lock);