Author: ian
Date: Sun May 18 16:03:34 2014
New Revision: 266405
URL: http://svnweb.freebsd.org/changeset/base/266405
Log:
MFC 256873: Make watchdog function conform watchdog(9):
Modified:
stable/10/sys/arm/allwinner/a10_wdog.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/arm/allwinner/a10_wdog.c
==============================================================================
--- stable/10/sys/arm/allwinner/a10_wdog.c Sun May 18 16:02:56 2014
(r266404)
+++ stable/10/sys/arm/allwinner/a10_wdog.c Sun May 18 16:03:34 2014
(r266405)
@@ -153,6 +153,18 @@ a10wd_watchdog_fn(void *private, u_int c
(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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
