patch-2.4.0-test9 linux/drivers/char/drm/r128_drv.c

• Lines: 43
• Date: Sun Oct 1 20:00:00 2000
• Orig file: v2.4.0-test8/linux/drivers/char/drm/r128_drv.c
• Orig date: Tue Aug 29 14:09:15 2000

diff -u --recursive --new-file v2.4.0-test8/linux/drivers/char/drm/r128_drv.c linux/drivers/char/drm/r128_drv.c
@@ -35,7 +35,7 @@
 
 #define R128_NAME	 "r128"
 #define R128_DESC	 "ATI Rage 128"
-#define R128_DATE	 "20000719"
+#define R128_DATE	 "20000928"
 #define R128_MAJOR	 1
 #define R128_MINOR	 0
 #define R128_PATCHLEVEL  0
@@ -467,7 +467,7 @@
 		}
 		spin_unlock(&dev->count_lock);
 	}
-	
+
 	return retcode;
 }
 
@@ -501,7 +501,7 @@
 		}
 		spin_unlock(&dev->count_lock);
 	}
-	
+
 	unlock_kernel();
 	return retcode;
 }
@@ -602,6 +602,7 @@
 #endif
                 add_wait_queue(&dev->lock.lock_queue, &entry);
                 for (;;) {
+                        current->state = TASK_INTERRUPTIBLE;
                         if (!dev->lock.hw_lock) {
                                 /* Device has been unregistered */
                                 ret = -EINTR;
@@ -617,7 +618,6 @@
 
                                 /* Contention */
                         atomic_inc(&dev->total_sleeps);
-                        current->state = TASK_INTERRUPTIBLE;
 #if 1
 			current->policy |= SCHED_YIELD;
 #endif