diff options
| author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2002-11-25 02:15:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-11-25 02:15:12 -0800 |
| commit | 64ae7d357b29417439dcddefd0827f3c5b18a606 (patch) | |
| tree | e5883c2f4877145c86668aad43bbc1975a097165 | |
| parent | db8b01012a4f0a188b56cae048174980013e548f (diff) | |
[PATCH] fix cs46xx build
| -rw-r--r-- | sound/pci/cs46xx/cs46xx_lib.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c index 272c6f3770e6..182491f8cb27 100644 --- a/sound/pci/cs46xx/cs46xx_lib.c +++ b/sound/pci/cs46xx/cs46xx_lib.c @@ -1027,6 +1027,7 @@ static int snd_cs46xx_capture_trigger(snd_pcm_substream_t * substream, return result; } +#ifdef CONFIG_SND_CS46XX_NEW_DSP static int _cs46xx_adjust_sample_rate (cs46xx_t *chip, cs46xx_pcm_t *cpcm, int sample_rate) { @@ -1055,7 +1056,6 @@ static int _cs46xx_adjust_sample_rate (cs46xx_t *chip, cs46xx_pcm_t *cpcm, 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; } @@ -1065,6 +1065,8 @@ static int _cs46xx_adjust_sample_rate (cs46xx_t *chip, cs46xx_pcm_t *cpcm, return 0; } +#endif + static int snd_cs46xx_playback_hw_params(snd_pcm_substream_t * substream, snd_pcm_hw_params_t * hw_params) { @@ -1087,6 +1089,7 @@ static int snd_cs46xx_playback_hw_params(snd_pcm_substream_t * substream, 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; } } |