From d14f0770f854187ff1750a15284e5fe8df4e1143 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Thu, 24 May 2012 18:58:02 +0300 Subject: [PATCH] --- yaml --- r: 309397 b: refs/heads/master c: bb644913a7d6dabcc4a1640817fa7b68938a56eb h: refs/heads/master i: 309395: 408a65272ea0b561ed3c0c0af95047a30a067e41 v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/sch56xx-common.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a3af066e63cf..651d812c02d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 664a0d7862a6b10c709d4b4a3655fe2c59a20064 +refs/heads/master: bb644913a7d6dabcc4a1640817fa7b68938a56eb diff --git a/trunk/drivers/hwmon/sch56xx-common.c b/trunk/drivers/hwmon/sch56xx-common.c index 839087caa360..4380f5d07be2 100644 --- a/trunk/drivers/hwmon/sch56xx-common.c +++ b/trunk/drivers/hwmon/sch56xx-common.c @@ -464,9 +464,9 @@ struct sch56xx_watchdog_data *sch56xx_watchdog_register(struct device *parent, data->wddev.min_timeout = 1; data->wddev.max_timeout = 255 * 60; if (nowayout) - data->wddev.status |= WDOG_NO_WAY_OUT; + set_bit(WDOG_NO_WAY_OUT, &data->wddev.status); if (output_enable & SCH56XX_WDOG_OUTPUT_ENABLE) - data->wddev.status |= WDOG_ACTIVE; + set_bit(WDOG_ACTIVE, &data->wddev.status); /* Since the watchdog uses a downcounter there is no register to read the BIOS set timeout from (if any was set at all) ->