diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-05-21 16:12:39 +0200 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-05-21 16:12:39 +0200 |
| commit | b3f87b98aa3dc22cc58f970140113b270015cddb (patch) | |
| tree | c4aec5996567ad96310f61e9244e799f41bf2625 /drivers/watchdog | |
| parent | NFSv4.1 resend LAYOUTGET on data server invalid layout errors (diff) | |
| parent | sunrpc: fix loss of task->tk_status after rpc_delay call in xprt_alloc_slot (diff) | |
| download | linux-b3f87b98aa3dc22cc58f970140113b270015cddb.tar.xz linux-b3f87b98aa3dc22cc58f970140113b270015cddb.zip | |
Merge branch 'bugfixes' into nfs-for-next
Diffstat (limited to 'drivers/watchdog')
| -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 cbc7ceef2786..9f13b897fd64 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) |