This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / char / watchdog / i8xx_tco.c

diff --git a/drivers/char/watchdog/i8xx_tco.c b/drivers/char/watchdog/i8xx_tco.c
index 76bf422..c32c93c 100644 (file)
--- a/drivers/char/watchdog/i8xx_tco.c
+++ b/drivers/char/watchdog/i8xx_tco.c
@@ -415,15 +415,12 @@ static unsigned char __init i8xx_tco_getdevice (void)
                        }
                }
                /* Set the TCO_EN bit in SMI_EN register */
-               if (!request_region (SMI_EN + 1, 1, "i8xx TCO")) {
-                       printk (KERN_ERR PFX "I/O address 0x%04x already in use\n",
-                               SMI_EN + 1);
-                       return 0;
-               }
                val1 = inb (SMI_EN + 1);
                val1 &= 0xdf;
                outb (val1, SMI_EN + 1);
-               release_region (SMI_EN + 1, 1);
+               /* Clear out the (probably old) status */
+               outb (0, TCO1_STS);
+               outb (3, TCO2_STS);
                return 1;
        }
        return 0;
@@ -446,10 +443,6 @@ static int __init watchdog_init (void)
                goto out;
        }
 
-       /* Clear out the (probably old) status */
-       outb (0, TCO1_STS);
-       outb (3, TCO2_STS);
-
        /* Check that the heartbeat value is within it's range ; if not reset to the default */
        if (tco_timer_set_heartbeat (heartbeat)) {
                heartbeat = WATCHDOG_HEARTBEAT;