aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/wdt_pci.c
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@sw.ru>2007-11-01 19:27:08 -0400
committerWim Van Sebroeck <wim@iguana.be>2007-11-02 15:09:07 -0400
commitc7dfd0cca300c5dc49213cf1c78c77393600410d (patch)
tree5a4a5ecb5ab0215113eacf763a9d15500a02b0ee /drivers/watchdog/wdt_pci.c
parent2ba7d7b39f3adf3f71aa3acab00111a429056c7d (diff)
[WATCHDOG] spin_lock_init() fixes
Some watchdog drivers initialize global spinlocks in module's init function which is tolerable, but some do it in PCI probe function. So, switch to static initialization to fix theoretical bugs and, more importantly, stop giving people bad examples. Signed-off-by: Alexey Dobriyan <adobriyan@sw.ru> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'drivers/watchdog/wdt_pci.c')
-rw-r--r--drivers/watchdog/wdt_pci.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/watchdog/wdt_pci.c b/drivers/watchdog/wdt_pci.c
index 6bfe0e29dc1a..1355608683e4 100644
--- a/drivers/watchdog/wdt_pci.c
+++ b/drivers/watchdog/wdt_pci.c
@@ -74,7 +74,7 @@
74static int dev_count; 74static int dev_count;
75 75
76static struct semaphore open_sem; 76static struct semaphore open_sem;
77static spinlock_t wdtpci_lock; 77static DEFINE_SPINLOCK(wdtpci_lock);
78static char expect_close; 78static char expect_close;
79 79
80static int io; 80static int io;
@@ -607,7 +607,6 @@ static int __devinit wdtpci_init_one (struct pci_dev *dev,
607 } 607 }
608 608
609 sema_init(&open_sem, 1); 609 sema_init(&open_sem, 1);
610 spin_lock_init(&wdtpci_lock);
611 610
612 irq = dev->irq; 611 irq = dev->irq;
613 io = pci_resource_start (dev, 2); 612 io = pci_resource_start (dev, 2);