From de4ccf451cbf43085aaee05881ee5548bdb403a9 Mon Sep 17 00:00:00 2001
From: ian <ian@FreeBSD.org>
Date: Sun, 18 May 2014 16:03:34 +0000
Subject: [PATCH] MFC 256873: Make watchdog function conform watchdog(9):

---
 sys/arm/allwinner/a10_wdog.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/sys/arm/allwinner/a10_wdog.c b/sys/arm/allwinner/a10_wdog.c
index a5af52dd13d..af7365b4abe 100644
--- a/sys/arm/allwinner/a10_wdog.c
+++ b/sys/arm/allwinner/a10_wdog.c
@@ -153,6 +153,18 @@ a10wd_watchdog_fn(void *private, u_int cmd, int *error)
 			    (wd_intervals[i].value << WDOG_MODE_INTVL_SHIFT) |
 			    WDOG_MODE_EN | WDOG_MODE_RST_EN);
 			WRITE(sc, WDOG_CTRL, WDOG_CTRL_RESTART);
+			*error = 0;
+		}
+		else {
+			/* 
+			 * Can't arm
+			 * disable watchdog as watchdog(9) requires
+			 */
+			device_printf(sc->dev,
+			    "Can't arm, timeout is more than 16 sec\n");
+			mtx_unlock(&sc->mtx);
+			WRITE(sc, WDOG_MODE, 0);
+			return;
 		}
 	}
 	else
-- 
2.45.2