patch-2.2.16 linux/drivers/sound/maestro.c

• Lines: 33
• Date: Wed Jun 7 14:26:43 2000
• Orig file: v2.2.15/linux/drivers/sound/maestro.c
• Orig date: Wed May 3 17:16:46 2000

diff -urN v2.2.15/linux/drivers/sound/maestro.c linux/drivers/sound/maestro.c
@@ -2407,10 +2407,24 @@
 	struct ess_state *s = (struct ess_state *)file->private_data;
 	unsigned long flags;
 	unsigned int mask = 0;
+	int ret;
 
 	VALIDATE_STATE(s);
+
+
+/* In 0.14 prog_dmabuf always returns success anyway ... */
+	if (file->f_mode & FMODE_WRITE) {
+		if (!s->dma_dac.ready && (ret = prog_dmabuf(s, 0))) 
+			return POLLERR;
+	}
+	if (file->f_mode & FMODE_READ) {
+	  	if (!s->dma_adc.ready && (ret = prog_dmabuf(s, 1)))
+			return POLLERR;
+	}
+
 	if (file->f_mode & (FMODE_WRITE|FMODE_READ))
 		poll_wait(file, &s->poll_wait, wait);
+
 	spin_lock_irqsave(&s->lock, flags);
 	ess_update_ptr(s);
 	if (file->f_mode & FMODE_READ) {
@@ -3448,6 +3462,7 @@
 				unregister_sound_dsp(s->dev_audio);
 		}
 		release_region(card->iobase, 256);		
+		unregister_reboot_notifier(&maestro_nb);
 		kfree(card);
 		return 0;
 	}