Fix NON BLOCKING issue with the sound driver

Signed-off-by: Jean-Paul Saman <jpsaman@videolan.org>

sound/oss/davinci-audio.c

@@ -507,6 +507,7 @@ audio_write(struct file *file, const char *buffer, size_t count, loff_t * ppos)
 	audio_state_t *state = file->private_data;
 	audio_stream_t *s = state->output_stream;
 	int chunksize, ret = 0;
+	unsigned long flags;
 
 	DPRINTK("audio_write: count=%d\n", count);
 	if (*ppos != file->f_pos) {
@@ -528,9 +529,14 @@ audio_write(struct file *file, const char *buffer, size_t count, loff_t * ppos)
 
 		/* Wait for a buffer to become free */
 		if (file->f_flags & O_NONBLOCK) {
-			ret = -EAGAIN;
-			if (!s->wfc.done)
+			if (!s->wfc.done) {
+				ret = -EAGAIN;
 				break;
+			} else {
+				local_irq_save(flags);
+				s->wfc.done--;
+				local_irq_restore(flags);
+			}
 		} else {
 			ret = -ERESTARTSYS;
 			if (wait_for_completion_interruptible(&s->wfc))
@@ -558,13 +564,14 @@ audio_write(struct file *file, const char *buffer, size_t count, loff_t * ppos)
 		}
 
 		/* Update pointers and send current fragment to DMA */
+		local_irq_save(flags);
 		b->offset = 0;
 		if (++s->usr_head >= s->nbfrags)
 			s->usr_head = 0;
 		/* Add the num of frags pending */
 		s->pending_frags++;
 		s->active = 1;
-
+		local_irq_restore(flags);
 		audio_process_dma(s);
 	}
 
@@ -614,9 +621,14 @@ audio_read(struct file *file, char *buffer, size_t count, loff_t * ppos)
 
 		/* Wait for a buffer to become full */
 		if (file->f_flags & O_NONBLOCK) {
-			ret = -EAGAIN;
-			if(!s->done_flag)
+			if (!s->wfc.done) {
+				ret = -EAGAIN;
 				break;
+			} else {
+				local_irq_save(flags);
+				s->wfc.done--;
+				local_irq_restore(flags);
+			}
 		} else {
 			ret = -ERESTARTSYS;
 			if (wait_for_completion_interruptible(&s->wfc))