pointless whitespace/comment fixes, no code changes

[oweals/busybox.git] / miscutils / watchdog.c

diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c
index e102a598ae2654a84d7b26186f87bb0fb77a4cf3..f85138e119e2483bd4f5a7f0f8ca3dd5e4737bd9 100644 (file)
--- a/miscutils/watchdog.c
+++ b/miscutils/watchdog.c
@@ -3,13 +3,14 @@
  * Mini watchdog implementation for busybox
  *
  * Copyright (C) 2003  Paul Mundt <lethal@linux-sh.org>
- * Copyright (C) 2006  Bernhard Fischer <busybox@busybox.net>
+ * Copyright (C) 2006  Bernhard Reutner-Fischer <busybox@busybox.net>
  * Copyright (C) 2008  Darius Augulis <augulis.darius@gmail.com>
  *
  * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
 
 #include "libbb.h"
+#include "linux/types.h" /* for __u32 */
 #include "linux/watchdog.h"
 
 #define OPT_FOREGROUND  (1 << 0)
@@ -55,7 +56,13 @@ int watchdog_main(int argc, char **argv)
        /* Use known fd # - avoid needing global 'int fd' */
        xmove_fd(xopen(argv[argc - 1], O_WRONLY), 3);
 
+       /* WDIOC_SETTIMEOUT takes seconds, not milliseconds */
+       htimer_duration = htimer_duration / 1000;
+#ifndef WDIOC_SETTIMEOUT
+#error WDIOC_SETTIMEOUT is not defined, cannot compile watchdog applet
+#else
        ioctl_or_warn(3, WDIOC_SETTIMEOUT, &htimer_duration);
+#endif
 #if 0
        ioctl_or_warn(3, WDIOC_GETTIMEOUT, &htimer_duration);
        printf("watchdog: SW timer is %dms, HW timer is %dms\n",
@@ -68,8 +75,8 @@ int watchdog_main(int argc, char **argv)
 
        while (1) {
                /*
-                * Make sure we clear the counter before sleeping, as the counter value
-                * is undefined at this point -- PFM
+                * Make sure we clear the counter before sleeping,
+                * as the counter value is undefined at this point -- PFM
                 */
                write(3, "", 1); /* write zero byte */
                usleep(stimer_duration * 1000L);