patch-2.4.6 linux/drivers/video/matrox/matroxfb_Ti3026.c

• Lines: 17
• Date: Wed Jun 27 17:10:55 2001
• Orig file: v2.4.5/linux/drivers/video/matrox/matroxfb_Ti3026.c
• Orig date: Thu Aug 10 12:34:31 2000

diff -u --recursive --new-file v2.4.5/linux/drivers/video/matrox/matroxfb_Ti3026.c linux/drivers/video/matrox/matroxfb_Ti3026.c
@@ -279,12 +279,14 @@
   0x00, 0x00, TVP3026_XCURCTRL_DIS };
 
 static void matroxfb_ti3026_flashcursor(unsigned long ptr) {
+	unsigned long flags;
+
 #define minfo ((struct matrox_fb_info*)ptr)
-	matroxfb_DAC_lock();
+	matroxfb_DAC_lock_irqsave(flags);
 	outTi3026(PMINFO TVP3026_XCURCTRL, inTi3026(PMINFO TVP3026_XCURCTRL) ^ TVP3026_XCURCTRL_DIS ^ TVP3026_XCURCTRL_XGA);
 	ACCESS_FBINFO(cursor.timer.expires) = jiffies + HZ/2;
 	add_timer(&ACCESS_FBINFO(cursor.timer));
-	matroxfb_DAC_unlock();
+	matroxfb_DAC_unlock_irqrestore(flags);
 #undef minfo
 }