diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2012-05-24 18:58:02 +0300 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2012-05-30 07:56:17 +0200 |
| commit | bb644913a7d6dabcc4a1640817fa7b68938a56eb (patch) | |
| tree | f49403e4616b7fb52db60613e2d974ffa17609c7 | |
| parent | 664a0d7862a6b10c709d4b4a3655fe2c59a20064 (diff) | |
| download | linux-bb644913a7d6dabcc4a1640817fa7b68938a56eb.tar.gz linux-bb644913a7d6dabcc4a1640817fa7b68938a56eb.tar.bz2 linux-bb644913a7d6dabcc4a1640817fa7b68938a56eb.zip | |
watchdog: sch56xx-common: set correct bits in register()
WDOG_NO_WAY_OUT (3) and WDOG_ACTIVE (0) are the bit numbers, not a mask.
So "data->wddev.status |= WDOG_ACTIVE;" was intended to set bit zero but
it is a no-op.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| -rw-r--r-- | drivers/hwmon/sch56xx-common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/sch56xx-common.c b/drivers/hwmon/sch56xx-common.c index 839087caa360..4380f5d07be2 100644 --- a/drivers/hwmon/sch56xx-common.c +++ b/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) -> |