--- drivers/sound/i810_audio.c.old	Mon Jun 11 00:23:05 2001
+++ drivers/sound/i810_audio.c	Tue Jun 12 19:03:50 2001
@@ -298,6 +298,7 @@
 		unsigned ossmaxfrags;
 		unsigned subdivision;
 	} dmabuf;
+	struct semaphore sem;
 };
 
 
@@ -1066,7 +1067,7 @@
 {
 	struct i810_state *state = (struct i810_state *)file->private_data;
 	struct dmabuf *dmabuf = &state->dmabuf;
-	ssize_t ret;
+	ssize_t ret = 0;
 	unsigned long flags;
 	unsigned int swptr;
 	int cnt;
@@ -1088,13 +1089,14 @@
 			return -EBUSY;
 		}
 	}
-	if (!dmabuf->ready && (ret = prog_dmabuf(state, 1)))
-		return ret;
 	if (!access_ok(VERIFY_WRITE, buffer, count))
 		return -EFAULT;
 	dmabuf->trigger &= ~PCM_ENABLE_OUTPUT;
-	ret = 0;
 
+	down(&state->sem);
+	if (!dmabuf->ready && (ret = prog_dmabuf(state, 1)))
+		goto out;
+	
 	while (count > 0) {
 		spin_lock_irqsave(&state->card->lock, flags);
 		swptr = dmabuf->swptr;
@@ -1119,8 +1121,9 @@
 			}
 			if (file->f_flags & O_NONBLOCK) {
 				if (!ret) ret = -EAGAIN;
-				return ret;
+				goto out;
 			}
+			up(&state->sem);
 			/* This isnt strictly right for the 810  but it'll do */
 			tmo = (dmabuf->dmasize * HZ) / (dmabuf->rate * 2);
 			tmo >>= 1;
@@ -1142,15 +1145,21 @@
 				   while loop begin and we REALLY have space to record */
 			}
 			if (signal_pending(current)) {
-				ret = ret ? ret : -ERESTARTSYS;
-				return ret;
+				if(!ret) ret = -ERESTARTSYS;
+				goto out;
+			}
+			down(&state->sem);
+			if (dmabuf->mapped)
+			{
+				ret = -ENXIO;
+				goto out;
 			}
 			continue;
 		}
 
 		if (copy_to_user(buffer, dmabuf->rawbuf + swptr, cnt)) {
 			if (!ret) ret = -EFAULT;
-			return ret;
+			goto out;
 		}
 
 		swptr = (swptr + cnt) % dmabuf->dmasize;
@@ -1164,6 +1173,8 @@
 		buffer += cnt;
 		ret += cnt;
 	}
+out:
+	up(&state->sem);
 	i810_update_lvi(state,1);
 	start_adc(state);
 	return ret;
@@ -1196,11 +1207,12 @@
 		if(!dmabuf->write_channel)
 			return -EBUSY;
 	}
-	if (!dmabuf->ready && (ret = prog_dmabuf(state, 0)))
-		return ret;
 	if (!access_ok(VERIFY_READ, buffer, count))
 		return -EFAULT;
 	dmabuf->trigger &= ~PCM_ENABLE_INPUT;
+	down(&state->sem);
+	if (!dmabuf->ready && (ret = prog_dmabuf(state, 0)))
+		goto out;
 	ret = 0;
 
 	while (count > 0) {
@@ -1228,8 +1240,9 @@
 			}
 			if (file->f_flags & O_NONBLOCK) {
 				if (!ret) ret = -EAGAIN;
-				return ret;
+				goto out;
 			}
+			up(&state->sem);
 			/* Not strictly correct but works */
 			tmo = (dmabuf->dmasize * HZ) / (dmabuf->rate * 4);
 			/* There are two situations when sleep_on_timeout returns, one is when
@@ -1252,13 +1265,19 @@
 			}
 			if (signal_pending(current)) {
 				if (!ret) ret = -ERESTARTSYS;
-				return ret;
+				goto out;
 			}
 			continue;
 		}
+		down(&state->sem);
+		if (dmabuf->mapped)
+		{
+			ret = -ENXIO;
+			goto out;
+		}
 		if (copy_from_user(dmabuf->rawbuf+swptr,buffer,cnt)) {
 			if (!ret) ret = -EFAULT;
-			return ret;
+			goto out;
 		}
 
 		swptr = (swptr + cnt) % dmabuf->dmasize;
@@ -1277,6 +1296,8 @@
 		if((x + dmabuf->count) < dmabuf->dmasize)
 			memset(dmabuf->rawbuf + swptr, '\0', x);
 	}
+out:
+	up(&state->sem);
 	i810_update_lvi(state,0);
 	if (!dmabuf->enable && dmabuf->count >= dmabuf->userfragsize)
 		start_dac(state);
@@ -1323,6 +1344,7 @@
 	unsigned long size;
 
 	lock_kernel();
+	down(&state->sem);
 	if (vma->vm_flags & VM_WRITE) {
 		if (!dmabuf->write_channel &&
 		    (dmabuf->write_channel =
@@ -1362,6 +1384,7 @@
 	printk("i810_audio: mmap'ed %ld bytes of data space\n", size);
 #endif
 out:
+	up(&state->sem);
 	unlock_kernel();
 	return ret;
 }
@@ -1784,6 +1807,7 @@
 	state->magic = I810_STATE_MAGIC;
 	init_waitqueue_head(&dmabuf->wait);
 	init_MUTEX(&state->open_sem);
+	init_MUTEX(&state->sem);
 	file->private_data = state;
 	dmabuf->trigger = 0;