diff options
| author | Gareth Hughes <gareth@users.sourceforge.net> | 2000-10-10 04:22:37 +0000 |
|---|---|---|
| committer | Gareth Hughes <gareth@users.sourceforge.net> | 2000-10-10 04:22:37 +0000 |
| commit | 9ae70d65072fcc1dffc99312a3ce000bedb7cfe0 (patch) | |
| tree | dcad625cd019f75bb419c9265b4878c5a0e34dc4 /linux/tdfx_drv.c | |
| parent | 4ca420eac5b8df93dbe5be1207bbc8592977b10f (diff) | |
Merge trunk with ati-4-1-1-branch. Needed for Mobility M3 to work with
latest 3D driver development.
Diffstat (limited to 'linux/tdfx_drv.c')
| -rw-r--r-- | linux/tdfx_drv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/tdfx_drv.c b/linux/tdfx_drv.c index 2026e9d0..5f2c804a 100644 --- a/linux/tdfx_drv.c +++ b/linux/tdfx_drv.c @@ -1,4 +1,4 @@ -/* tdfx.c -- tdfx driver -*- linux-c -*- +/* tdfx_drv.c -- tdfx driver -*- linux-c -*- * Created: Thu Oct 7 10:38:32 1999 by faith@precisioninsight.com * * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. @@ -36,7 +36,7 @@ #define TDFX_NAME "tdfx" #define TDFX_DESC "3dfx Banshee/Voodoo3+" -#define TDFX_DATE "20000910" +#define TDFX_DATE "20000928" #define TDFX_MAJOR 1 #define TDFX_MINOR 0 #define TDFX_PATCHLEVEL 0 @@ -561,6 +561,7 @@ int tdfx_lock(struct inode *inode, struct file *filp, unsigned int cmd, #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; @@ -576,7 +577,6 @@ int tdfx_lock(struct inode *inode, struct file *filp, unsigned int cmd, /* Contention */ atomic_inc(&dev->total_sleeps); - current->state = TASK_INTERRUPTIBLE; #if 1 current->policy |= SCHED_YIELD; #endif |