From 1e73fdca5e8c201d468c0562c6239b7d733ca452 Mon Sep 17 00:00:00 2001 From: Takahisa Tanaka Date: Mon, 14 Jan 2013 11:01:57 +0900 Subject: [PATCH] --- yaml --- r: 360583 b: refs/heads/master c: 10ab329b5db7e592a3a60b4594e4e5f40b60c45c h: refs/heads/master i: 360581: 5abd26bef5d2cc935bee872b8297b57a3d4627f3 360579: e6f8e366b02889eabe3f67af9949c8017a19e3b4 360575: fb23d2e6213df12fca23f6a1004312852a4b8ff6 v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/sp5100_tco.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 428825a3b988..c8d6dc73800e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6737176569d1d6356c644694d60ea2b265cb3870 +refs/heads/master: 10ab329b5db7e592a3a60b4594e4e5f40b60c45c diff --git a/trunk/drivers/watchdog/sp5100_tco.c b/trunk/drivers/watchdog/sp5100_tco.c index 2b0e000d4377..5dfe86ebdc8b 100644 --- a/trunk/drivers/watchdog/sp5100_tco.c +++ b/trunk/drivers/watchdog/sp5100_tco.c @@ -500,14 +500,15 @@ static unsigned char sp5100_tco_setupdevice(void) /* Restore to the low three bits, if chipset is SB8x0(or later) */ if (sp5100_tco_pci->revision >= 0x40) { u8 reserved_bit; - reserved_bit = inb(base_addr) & 0x7; + outb(base_addr+0, index_reg); + reserved_bit = inb(data_reg) & 0x7; val |= (u32)reserved_bit; } /* Re-programming the watchdog timer base address */ outb(base_addr+0, index_reg); /* Low three bits of BASE are reserved */ - outb((val >> 0) & 0xf8, data_reg); + outb((val >> 0) & 0xff, data_reg); outb(base_addr+1, index_reg); outb((val >> 8) & 0xff, data_reg); outb(base_addr+2, index_reg);