fix RTAI spin_lock defs

diff --git a/include/linux/comedi_rt.h b/include/linux/comedi_rt.h
index fc0b9a82efaaad055273ce8a649a88797c29aaa5..12f0c932a6a97b0defc3dfa4e46ce2bd557d9008 100644 (file)
--- a/include/linux/comedi_rt.h
+++ b/include/linux/comedi_rt.h
@@ -71,20 +71,27 @@ void comedi_rt_pend_wakeup(wait_queue_head_t *q);
 // define a spin_lock_irqsave function that will work with rt or without
 
 #if defined(CONFIG_COMEDI_RTAI)
-#define comedi_spin_lock_irqsave(x, flags)     rt_spin_lock_irqsave(x, flags)
-#define comedi_spin_unlock_irqrestore(x, flags)        rt_spin_unlock_irqrestore(x, flags)
+#define comedi_spin_lock_irqsave(x, flags)             \
+       (flags = rt_spin_lock_irqsave(x))
+#define comedi_spin_unlock_irqrestore(x, flags)                \
+       rt_spin_unlock_irqrestore(flags, x)
 
 #elif defined(CONFIG_COMEDI_RTL)
-#define comedi_spin_lock_irqsave(x, flags)     rtl_spin_lock_irqsave(x, flags)
-#define comedi_spin_unlock_irqrestore(x, flags)        rtl_spin_unlock_irqrestore(x, flags)
+#define comedi_spin_lock_irqsave(x, flags)             \
+       rtl_spin_lock_irqsave(x, flags)
+#define comedi_spin_unlock_irqrestore(x, flags)                \
+       rtl_spin_unlock_irqrestore(x, flags)
 
 #elif defined(CONFIG_COMEDI_RTL_V1)
-#define comedi_spin_lock_irqsave(x, flags)     rtl_spin_lock_irqsave(x, flags)
-#define comedi_spin_unlock_irqrestore(x, flags)        rtl_spin_unlock_irqrestore(x, flags)
+#define comedi_spin_lock_irqsave(x, flags)             \
+       rtl_spin_lock_irqsave(x, flags)
+#define comedi_spin_unlock_irqrestore(x, flags)                \
+       rtl_spin_unlock_irqrestore(x, flags)
 
 #else
-#define comedi_spin_lock_irqsave(x, flags)     spin_lock_irqsave(x, flags);
-#define comedi_spin_unlock_irqrestore(x, flags)        spin_unlock_irqrestore(x, flags);
+// These are defined in comedidev.h
+//#define comedi_spin_lock_irqsave(x, flags)   spin_lock_irqsave(x, flags)
+//#define comedi_spin_unlock_irqrestore(x, flags)      spin_unlock_irqrestore(x, flags)
 
 #endif