diff --git a/[refs] b/[refs]
index 033b7b1660e1..c5fb9a1bfa69 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ffbffe37de3979d43c1105e38eb2918bf5d35fe
+refs/heads/master: 7280b51a29f8e6cc7d449d565182d1e1b6183907
diff --git a/trunk/drivers/ssb/driver_extif.c b/trunk/drivers/ssb/driver_extif.c
index dc47f30e9cf7..0aa4c2a85774 100644
--- a/trunk/drivers/ssb/driver_extif.c
+++ b/trunk/drivers/ssb/driver_extif.c
@@ -112,9 +112,10 @@ void ssb_extif_get_clockcontrol(struct ssb_extif *extif,
 	*m = extif_read32(extif, SSB_EXTIF_CLOCK_SB);
 }
 
-void ssb_extif_watchdog_timer_set(struct ssb_extif *extif,
-				  u32 ticks)
+void ssb_extif_watchdog_timer_set(struct ssb_extif *extif, u32 ticks)
 {
+	if (ticks > SSB_EXTIF_WATCHDOG_MAX_TIMER)
+		ticks = SSB_EXTIF_WATCHDOG_MAX_TIMER;
 	extif_write32(extif, SSB_EXTIF_WATCHDOG, ticks);
 }
 
diff --git a/trunk/include/linux/ssb/ssb_driver_extif.h b/trunk/include/linux/ssb/ssb_driver_extif.h
index 2604efa7dc4d..b618188939d2 100644
--- a/trunk/include/linux/ssb/ssb_driver_extif.h
+++ b/trunk/include/linux/ssb/ssb_driver_extif.h
@@ -152,6 +152,7 @@
 /* watchdog */
 #define SSB_EXTIF_WATCHDOG_CLK		48000000	/* Hz */
 
+#define SSB_EXTIF_WATCHDOG_MAX_TIMER	((1 << 28) - 1)
 
 
 #ifdef CONFIG_SSB_DRIVER_EXTIF