Merge with Linux 2.4.0.

6 files changed, 21 insertions, 25 deletions

diff --git a/drivers/sound/cs46xx.c b/drivers/sound/cs46xx.c
index d3ff7d71f..cbeccf666 100644
--- a/drivers/sound/cs46xx.c
+++ b/drivers/sound/cs46xx.c
@@ -1971,7 +1971,6 @@ static ssize_t cs_read(struct file *file, char *buffer, size_t count, loff_t *pp
 			start_adc(state);
 			if (file->f_flags & O_NONBLOCK) {
 				if (!ret) ret = -EAGAIN;
-				remove_wait_queue(&state->dmabuf.wait, &wait);
 				break;
  			}
 			schedule();
diff --git a/drivers/sound/i810_audio.c b/drivers/sound/i810_audio.c
index 204034131..ab2dacd89 100644
--- a/drivers/sound/i810_audio.c
+++ b/drivers/sound/i810_audio.c
@@ -144,13 +144,13 @@ struct i810_channel
 
 #define ENUM_ENGINE(PRE,DIG) 									\
 enum {												\
-	##PRE##_BDBAR =	0x##DIG##0,		/* Buffer Descriptor list Base Address */	\
-	##PRE##_CIV =	0x##DIG##4,		/* Current Index Value */			\
-	##PRE##_LVI =	0x##DIG##5,		/* Last Valid Index */				\
-	##PRE##_SR =	0x##DIG##6,		/* Status Register */				\
-	##PRE##_PICB =	0x##DIG##8,		/* Position In Current Buffer */		\
-	##PRE##_PIV =	0x##DIG##a,		/* Prefetched Index Value */			\
-	##PRE##_CR =	0x##DIG##b		/* Control Register */				\
+	PRE##_BDBAR =	0x##DIG##0,		/* Buffer Descriptor list Base Address */	\
+	PRE##_CIV =	0x##DIG##4,		/* Current Index Value */			\
+	PRE##_LVI =	0x##DIG##5,		/* Last Valid Index */				\
+	PRE##_SR =	0x##DIG##6,		/* Status Register */				\
+	PRE##_PICB =	0x##DIG##8,		/* Position In Current Buffer */		\
+	PRE##_PIV =	0x##DIG##a,		/* Prefetched Index Value */			\
+	PRE##_CR =	0x##DIG##b		/* Control Register */				\
 }
 
 ENUM_ENGINE(OFF,0);	/* Offsets */
@@ -770,7 +770,10 @@ static void i810_clear_tail(struct i810_state *state)
 	swptr = dmabuf->swptr;
 	spin_unlock_irqrestore(&state->card->lock, flags);
 
-	len = swptr % (dmabuf->dmasize/SG_LEN);
+	if(dmabuf->dmasize)
+		len = swptr % (dmabuf->dmasize/SG_LEN);
+	else
+		len = 0;
 	
 	memset(dmabuf->rawbuf + swptr, silence, len);
 
@@ -1800,7 +1803,7 @@ static int __init i810_ac97_init(struct i810_card *card)
 			if(!(i810_ac97_get(codec, AC97_EXTENDED_STATUS)&1))
 			{
 				printk(KERN_WARNING "i810_audio: Codec refused to allow VRA, using 48Khz only.\n");
-					card->ac97_features&=~1;
+				card->ac97_features&=~1;
 			}
 		}
    		
@@ -1894,12 +1897,6 @@ static int __init i810_probe(struct pci_dev *pci_dev, const struct pci_device_id
 	}
 	pci_dev->driver_data = card;
 	pci_dev->dma_mask = I810_DMA_MASK;
-
-//	printk("resetting codec?\n");
-	outl(0, card->iobase + GLOB_CNT);
-	udelay(500);
-//	printk("bringing it back?\n");
-	outl(1<<1, card->iobase + GLOB_CNT);
 	return 0;
 }
 
diff --git a/drivers/sound/mpu401.c b/drivers/sound/mpu401.c
index e6bb002e0..b53d0ffaf 100644
--- a/drivers/sound/mpu401.c
+++ b/drivers/sound/mpu401.c
@@ -1449,7 +1449,7 @@ static int mpu_timer_event(int dev, unsigned char *event)
 			}
 			break;
 
-		default:
+		default:;
 	}
 	return TIMER_NOT_ARMED;
 }
@@ -1559,7 +1559,7 @@ static int mpu_timer_ioctl(int dev, unsigned int command, caddr_t arg)
 			setup_metronome(midi_dev);
 			return 0;
 
-		default:
+		default:;
 	}
 	return -EINVAL;
 }
diff --git a/drivers/sound/sb_ess.c b/drivers/sound/sb_ess.c
index a52fd18e2..76f466d3b 100644
--- a/drivers/sound/sb_ess.c
+++ b/drivers/sound/sb_ess.c
@@ -770,7 +770,7 @@ printk(KERN_INFO "FKS: ess_handle_channel %s irq_mode=%d\n", channel, irq_mode);
 		case IMODE_INIT:
 			break;
 
-		default:
+		default:;
 			/* printk(KERN_WARN "ESS: Unexpected interrupt\n"); */
 	}
 }
diff --git a/drivers/sound/sequencer.c b/drivers/sound/sequencer.c
index d6f4998ff..d1be5e958 100644
--- a/drivers/sound/sequencer.c
+++ b/drivers/sound/sequencer.c
@@ -511,7 +511,7 @@ static void seq_chn_voice_event(unsigned char *event_rec)
 			synth_devs[dev]->aftertouch(dev, voice, parm);
 			break;
 
-		default:
+		default:;
 	}
 #undef dev
 #undef cmd
@@ -614,7 +614,7 @@ static void seq_chn_common_event(unsigned char *event_rec)
 				synth_devs[dev]->bender(dev, chn, w14);
 			break;
 
-		default:
+		default:;
 	}
 }
 
@@ -684,7 +684,7 @@ static int seq_timing_event(unsigned char *event_rec)
 			}
 			break;
 
-		default:
+		default:;
 	}
 
 	return TIMER_NOT_ARMED;
@@ -701,7 +701,7 @@ static void seq_local_event(unsigned char *event_rec)
 			DMAbuf_start_devices(parm);
 			break;
 
-		default:
+		default:;
 	}
 }
 
@@ -859,7 +859,7 @@ static int play_event(unsigned char *q)
 			seq_sysex_message(q);
 			break;
 
-		default:
+		default:;
 	}
 	return 0;
 }
diff --git a/drivers/sound/sound_timer.c b/drivers/sound/sound_timer.c
index e0ba45cde..4b5cbd0d4 100644
--- a/drivers/sound/sound_timer.c
+++ b/drivers/sound/sound_timer.c
@@ -165,7 +165,7 @@ static int timer_event(int dev, unsigned char *event)
 			seq_copy_to_input(event, 8);
 			break;
 
-		default:
+		default:;
 	}
 	return TIMER_NOT_ARMED;
 }