]> err.no Git - linux-2.6/commitdiff
[WATCHDOG] pcwd_pci.c - spinlock fixes
authorWim Van Sebroeck <wim@iguana.be>
Sun, 7 Jan 2007 20:57:03 +0000 (21:57 +0100)
committerWim Van Sebroeck <wim@iguana.be>
Sun, 7 Jan 2007 20:57:03 +0000 (21:57 +0100)
the keepalive and get_temperature functions should
use spinlocks also.

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
drivers/char/watchdog/pcwd_pci.c

index 059ac9f12de7dcb26ebe6069fa422bb96c37794f..95ddcd8c1db2e7d297789cf477b0cd35bd34bada 100644 (file)
@@ -298,7 +298,9 @@ static int pcipcwd_stop(void)
 static int pcipcwd_keepalive(void)
 {
        /* Re-trigger watchdog by writing to port 0 */
+       spin_lock(&pcipcwd_private.io_lock);
        outb_p(0x42, pcipcwd_private.io_addr);  /* send out any data */
+       spin_unlock(&pcipcwd_private.io_lock);
 
        if (debug >= DEBUG)
                printk(KERN_DEBUG PFX "Watchdog keepalive signal send\n");
@@ -385,7 +387,9 @@ static int pcipcwd_get_temperature(int *temperature)
        if (!pcipcwd_private.supports_temp)
                return -ENODEV;
 
+       spin_lock(&pcipcwd_private.io_lock);
        *temperature = inb_p(pcipcwd_private.io_addr);
+       spin_unlock(&pcipcwd_private.io_lock);
 
        /*
         * Convert celsius to fahrenheit, since this was
@@ -814,6 +818,8 @@ static int __init pcipcwd_init_module(void)
 static void __exit pcipcwd_cleanup_module(void)
 {
        pci_unregister_driver(&pcipcwd_driver);
+
+       printk(KERN_INFO PFX "Watchdog Module Unloaded.\n");
 }
 
 module_init(pcipcwd_init_module);