[Linux-mips-commits]CVS: linux/drivers/sound Config.in,1.12,1.13 hal2.c,1.1,1.2

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/sound
In directory usw-pr-cvs1:/tmp/cvs-serv8883

Modified Files:
	Config.in hal2.c 
Log Message:
Fix harm done by recent Indy patches.

Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/sound/Config.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Config.in	2002/01/28 21:00:02	1.12
+++ Config.in	2002/02/05 17:25:11	1.13
@@ -48,7 +48,9 @@
 fi
 dep_tristate '  RME Hammerfall (RME96XX) support' CONFIG_SOUND_RME96XX $CONFIG_SOUND $CONFIG_PCI $CONFIG_EXPERIMENTAL
 dep_tristate '  S3 SonicVibes' CONFIG_SOUND_SONICVIBES $CONFIG_SOUND
-dep_tristate '  SGI Visual Workstation sound' CONFIG_SOUND_VWSND $CONFIG_SOUND $CONFIG_VISWS
+if [ "$CONFIG_VISWS" = "y" ]; then
+   dep_tristate '  SGI Visual Workstation sound' CONFIG_SOUND_VWSND $CONFIG_SOUND
+fi
 dep_tristate '  SGI HAL2 sound (EXPERIMENTAL)' CONFIG_SOUND_HAL2 $CONFIG_SOUND $CONFIG_SGI_IP22 $CONFIG_EXPERIMENTAL
 
 if [ "$CONFIG_MIPS_ITE8172" = "y" -o "$CONFIG_MIPS_IVR" = "y" ]; then

Index: hal2.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/sound/hal2.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hal2.c	2002/01/28 21:00:02	1.1
+++ hal2.c	2002/02/05 17:25:11	1.2
@@ -273,16 +273,18 @@
 	if (running)
 		dac->tail = dac->tail->info.next;
 
-	wake_up(&dac->dma_wait);
-	
 	spin_unlock(&dac->lock);
+
+	wake_up(&dac->dma_wait);
 }
 
 static void hal2_adc_interrupt(hal2_codec_t *adc)
 {
 	spin_lock(&adc->lock);
-	wake_up(&adc->dma_wait);
+	/* TODO :)) */
 	spin_unlock(&adc->lock);
+
+	wake_up(&adc->dma_wait);
 }
 
 static void hal2_interrupt(int irq, void *dev_id, struct pt_regs *regs)
@@ -924,6 +926,8 @@
 	case SNDCTL_DSP_NONBLOCK:
 		file->f_flags |= O_NONBLOCK;
 		return 0;
+	case SNDCTL_DSP_GETBLKSIZE:
+		return put_user(H2_BUFFER_SIZE, (int *)arg);
 	case SOUND_PCM_READ_RATE:
 		val = -EINVAL;
 		if (file->f_mode & FMODE_READ)