From: Frank Mori Hess <fmhess@speakeasy.net>
Date: Mon, 21 Nov 2005 00:11:58 +0000 (+0000)
Subject: Static initialization of spinlocks has been deprecated by the kernel
X-Git-Tag: r0_7_71~125
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6ffae84bb0718cd7a45b88ae9285b1aaf84c1d2e;p=comedi.git

Static initialization of spinlocks has been deprecated by the kernel
(from anders.blomdell@control.lth.se (Anders Blomdell)).
---

diff --git a/comedi/comedi_fops.c b/comedi/comedi_fops.c
index 1c88bd14..272f7f3e 100644
--- a/comedi/comedi_fops.c
+++ b/comedi/comedi_fops.c
@@ -58,7 +58,7 @@ MODULE_PARM(comedi_debug, "i");
 #endif
 
 comedi_device *comedi_devices;
-spinlock_t big_comedi_lock = SPIN_LOCK_UNLOCKED;
+spinlock_t big_comedi_lock; /* Dynamic initialization */
 
 static int do_devconfig_ioctl(comedi_device *dev,comedi_devconfig *arg,unsigned int minor);
 static int do_bufconfig_ioctl(comedi_device *dev,void *arg);
@@ -1707,6 +1707,7 @@ static int __init comedi_init(void)
 	int i;
 
 	printk("comedi: version " COMEDI_RELEASE " - David Schleef <ds@schleef.org>\n");
+	spin_lock_init(&big_comedi_lock);
 	if(devfs_register_chrdev(COMEDI_MAJOR,"comedi",&comedi_fops)){
 		printk("comedi: unable to get major %d\n",COMEDI_MAJOR);
 		return -EIO;