diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-26 15:31:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-26 15:31:53 -0700 |
| commit | 65dd4b91080157fce76a3d60338e33dfa02c4bf8 (patch) | |
| tree | 611e98d8a4ca40103bd550c4a3eb46dfadebd4ca /drivers | |
| parent | aaaf06981718ed0e033319897079530f6ec623d3 (diff) | |
| parent | d08c9a33b4aa6665b0ee3c4d1b57715fa0eae2a2 (diff) | |
| download | linux-3.10-65dd4b91080157fce76a3d60338e33dfa02c4bf8.tar.gz linux-3.10-65dd4b91080157fce76a3d60338e33dfa02c4bf8.tar.bz2 linux-3.10-65dd4b91080157fce76a3d60338e33dfa02c4bf8.zip | |
Merge git://www.linux-watchdog.org/linux-watchdog
Pull a watchdog fix from Wim Van Sebroeck:
"It will fix the size when reading or writing to WD Timer port 0x72 in
the hpwdt driver."
* git://www.linux-watchdog.org/linux-watchdog:
hpwdt: Only BYTE reads/writes to WD Timer port 0x72
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/watchdog/hpwdt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index cbc7ceef278..9f13b897fd6 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c @@ -435,16 +435,16 @@ static void hpwdt_start(void) { reload = SECS_TO_TICKS(soft_margin); iowrite16(reload, hpwdt_timer_reg); - iowrite16(0x85, hpwdt_timer_con); + iowrite8(0x85, hpwdt_timer_con); } static void hpwdt_stop(void) { unsigned long data; - data = ioread16(hpwdt_timer_con); + data = ioread8(hpwdt_timer_con); data &= 0xFE; - iowrite16(data, hpwdt_timer_con); + iowrite8(data, hpwdt_timer_con); } static void hpwdt_ping(void) |