[ARM PATCH] 2132/1: Fix timer NULL pointer de-reference on suspend

Patch from Ben Dooks

Timer suspend code fails to check for NULL before
calling the timer implementor's suspend or resume hooks.

Signed-off-by: Ben Dooks

diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c
index f80a89de33c3b6d8ce8007dd41a5d41690021a2a..725a74d8580dc8f7aef282865596d9b60f407f33 100644 (file)
--- a/arch/arm/kernel/time.c
+++ b/arch/arm/kernel/time.c
@@ -351,14 +351,20 @@ void timer_tick(struct pt_regs *regs)
 static int timer_suspend(struct sys_device *dev, u32 state)
 {
        struct sys_timer *timer = container_of(dev, struct sys_timer, dev);
-       timer->suspend();
+
+       if (timer->suspend != NULL)
+               timer->suspend();
+
        return 0;
 }
 
 static int timer_resume(struct sys_device *dev)
 {
        struct sys_timer *timer = container_of(dev, struct sys_timer, dev);
-       timer->resume();
+
+       if (timer->resume != NULL)
+               timer->resume();
+
        return 0;
 }
 #else