summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@fairlite.demon.co.uk>2000-12-01 14:22:31 +0000
committerAlan Hourihane <alanh@fairlite.demon.co.uk>2000-12-01 14:22:31 +0000
commit98b5d4d26f4e97613afccfe8cb0bb05ad96bc960 (patch)
tree19a567c75d0f9bbf79082fa0e4ca740690e1f073
parente094165a3de1714060e3da7343354ae2c5c595ad (diff)
merge trunk into tdfx-3-0-0-branch freeze tag before merge istdfx-3-0-0-20010104-freezetdfx-3-0-0-20001201
tdfx-3-0-0-20001201-freeze
-rw-r--r--linux/dma.c1
-rw-r--r--linux/sis_mm.c10
2 files changed, 6 insertions, 5 deletions
diff --git a/linux/dma.c b/linux/dma.c
index 5cc3ec369..56dd2441e 100644
--- a/linux/dma.c
+++ b/linux/dma.c
@@ -405,6 +405,7 @@ int drm_dma_enqueue(drm_device_t *dev, drm_dma_t *d)
schedule();
if (signal_pending(current)) {
atomic_dec(&q->use_count);
+ remove_wait_queue(&q->write_queue, &entry);
return -EINTR;
}
}
diff --git a/linux/sis_mm.c b/linux/sis_mm.c
index 1eee73c8e..4c2b5a6c6 100644
--- a/linux/sis_mm.c
+++ b/linux/sis_mm.c
@@ -79,7 +79,7 @@ int sis_fb_alloc(struct inode *inode, struct file *filp, unsigned int cmd,
int retval = 0;
if (copy_from_user(&fb, (drm_sis_mem_t *)arg, sizeof(fb)))
- return -EFAULT;
+ return -EFAULT;
req.size = fb.size;
sis_malloc(&req);
@@ -113,7 +113,7 @@ int sis_fb_free(struct inode *inode, struct file *filp, unsigned int cmd,
int retval = 0;
if (copy_from_user(&fb, (drm_sis_mem_t *)arg, sizeof(fb)))
- return -EFAULT;
+ return -EFAULT;
if(!fb.free){
return -1;
@@ -155,7 +155,7 @@ int sis_agp_init(struct inode *inode, struct file *filp, unsigned int cmd,
drm_sis_agp_t agp;
if (copy_from_user(&agp, (drm_sis_agp_t *)arg, sizeof(agp)))
- return -EFAULT;
+ return -EFAULT;
AgpHeap = mmInit(agp.offset, agp.size);
@@ -175,7 +175,7 @@ int sis_agp_alloc(struct inode *inode, struct file *filp, unsigned int cmd,
return -1;
if (copy_from_user(&agp, (drm_sis_mem_t *)arg, sizeof(agp)))
- return -EFAULT;
+ return -EFAULT;
block = mmAllocMem(AgpHeap, agp.size, 0, 0);
if(block){
@@ -211,7 +211,7 @@ int sis_agp_free(struct inode *inode, struct file *filp, unsigned int cmd,
return -1;
if (copy_from_user(&agp, (drm_sis_mem_t *)arg, sizeof(agp)))
- return -EFAULT;
+ return -EFAULT;
if(!agp.free){
return -1;