diff -Nur linus-2.5/sound/pci/cs46xx/cs46xx_lib.c localtree/sound/pci/cs46xx/cs46xx_lib.c
--- linus-2.5/sound/pci/cs46xx/cs46xx_lib.c 2002-11-11 02:30:03.000000000 -0500
+++ localtree/sound/pci/cs46xx/cs46xx_lib.c 2002-11-11 02:23:16.000000000 -0500
@@ -1023,6 +1023,7 @@
return result;
}
+#ifdef CONFIG_SND_CS46XX_NEW_DSP
static int _cs46xx_adjust_sample_rate (cs46xx_t *chip, cs46xx_pcm_t *cpcm,
int sample_rate)
{
@@ -1051,7 +1052,6 @@
cpcm->hw_addr,
cpcm->pcm_channel->pcm_channel_id)) == NULL) {
snd_printk(KERN_ERR "cs46xx: failed to re-create virtual PCM channel\n");
- up (&chip->spos_mutex);
return -ENXIO;
}
@@ -1061,6 +1061,8 @@
return 0;
}
+#endif
+
static int snd_cs46xx_playback_hw_params(snd_pcm_substream_t * substream,
snd_pcm_hw_params_t * hw_params)
{
@@ -1083,6 +1085,7 @@
if (cpcm->pcm_channel->pcm_channel_id != DSP_IEC958_CHANNEL ||
!(chip->dsp_spos_instance->spdif_status_out & DSP_SPDIF_STATUS_AC3_MODE)) {
if (_cs46xx_adjust_sample_rate (chip,cpcm,sample_rate)) {
+ up (&chip->spos_mutex);
return -ENXIO;
}
}