diff --git a/[refs] b/[refs]
index b75ddf3750c7..c31a079a5aad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9bb48a2c25a96757d13795ba7cc52687f94446f
+refs/heads/master: e9b852b8a7bc0217a03afff07fad34093e087542
diff --git a/trunk/drivers/clocksource/samsung_pwm_timer.c b/trunk/drivers/clocksource/samsung_pwm_timer.c
index 9f4bd6aa2343..cb866156b8b0 100644
--- a/trunk/drivers/clocksource/samsung_pwm_timer.c
+++ b/trunk/drivers/clocksource/samsung_pwm_timer.c
@@ -263,7 +263,8 @@ static void __init samsung_clockevent_init(void)
 	pwm.clock_count_per_tick = clock_rate / HZ;
 
 	time_event_device.cpumask = cpumask_of(0);
-	clockevents_config_and_register(&time_event_device, clock_rate, 1, -1);
+	clockevents_config_and_register(&time_event_device,
+						clock_rate, 1, pwm.tcnt_max);
 
 	irq_number = pwm.irq[pwm.event_id];
 	setup_irq(irq_number, &samsung_clock_event_irq);