Date: Sun, 18 May 2014 16:03:35 +0000 (UTC) From: Ian Lepore <ian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r266405 - stable/10/sys/arm/allwinner Message-ID: <201405181603.s4IG3Z6B002833@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405181603.s4IG3Z6B002833>