watchdog: wafer5823wdt: Fix handling WDIOS_DISABLECARD/WDIOS_ENABLECARD options

[mv-sheeva.git] / drivers / watchdog / ks8695_wdt.c

diff --git a/drivers/watchdog/ks8695_wdt.c b/drivers/watchdog/ks8695_wdt.c
index 811471903e8a7390f68d46b60998307be76b2be1..51757a520e8f07d96f8e247b960eda886fda8528 100644 (file)
--- a/drivers/watchdog/ks8695_wdt.c
+++ b/drivers/watchdog/ks8695_wdt.c
@@ -42,7 +42,7 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
 
 
 static unsigned long ks8695wdt_busy;
-static spinlock_t ks8695_lock;
+static DEFINE_SPINLOCK(ks8695_lock);
 
 /* ......................................................................... */
 
@@ -288,7 +288,6 @@ static struct platform_driver ks8695wdt_driver = {
 
 static int __init ks8695_wdt_init(void)
 {
-       spin_lock_init(&ks8695_lock);
        /* Check that the heartbeat value is within range;
           if not reset to the default */
        if (ks8695_wdt_settimeout(wdt_time)) {