---

yaml
---
r: 360583
b: refs/heads/master
c: 10ab329
h: refs/heads/master
i:
  360581: 5abd26b
  360579: e6f8e36
  360575: fb23d2e
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6737176569d1d6356c644694d60ea2b265cb3870
+refs/heads/master: 10ab329b5db7e592a3a60b4594e4e5f40b60c45c

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);