---

yaml --- r: 342007 b: refs/heads/master c: 7280b51 h: refs/heads/master i: 342005: e719722 342003: f522d46 341999: e0b8e32 v: v3
git-mirror · Dec 6, 2012 · 18edf7e · 18edf7e
1 parent 82e31b4
commit 18edf7e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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