On Wed, May 25, 2016 at 08:37:49AM +0200, Wolfram Sang wrote:
> From: Wolfram Sang <wsa+renesas@xxxxxxxxxxxxxxxxxxxx>
>
> Signed-off-by: Wolfram Sang <wsa+renesas@xxxxxxxxxxxxxxxxxxxx>
Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx>
> ---
> drivers/watchdog/softdog.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/watchdog/softdog.c b/drivers/watchdog/softdog.c
> index 5e3a30b99d4415..b067edf246dff2 100644
> --- a/drivers/watchdog/softdog.c
> +++ b/drivers/watchdog/softdog.c
> @@ -57,9 +57,9 @@ MODULE_PARM_DESC(soft_panic,
> static void softdog_fire(unsigned long data)
> {
> module_put(THIS_MODULE);
> - if (soft_noboot)
> + if (soft_noboot) {
> pr_crit("Triggered - Reboot ignored\n");
> - else if (soft_panic) {
> + } else if (soft_panic) {
> pr_crit("Initiating panic\n");
> panic("Software Watchdog Timer expired");
> } else {
> @@ -74,7 +74,7 @@ static struct timer_list softdog_ticktock =
>
> static int softdog_ping(struct watchdog_device *w)
> {
> - if (!mod_timer(&softdog_ticktock, jiffies+(w->timeout*HZ)))
> + if (!mod_timer(&softdog_ticktock, jiffies + (w->timeout * HZ)))
> __module_get(THIS_MODULE);
> return 0;
> }
> --
> 2.8.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
