Commit 64ae7d35 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

[PATCH] fix cs46xx build

parent db8b0101
...@@ -1027,6 +1027,7 @@ static int snd_cs46xx_capture_trigger(snd_pcm_substream_t * substream, ...@@ -1027,6 +1027,7 @@ static int snd_cs46xx_capture_trigger(snd_pcm_substream_t * substream,
return result; return result;
} }
#ifdef CONFIG_SND_CS46XX_NEW_DSP
static int _cs46xx_adjust_sample_rate (cs46xx_t *chip, cs46xx_pcm_t *cpcm, static int _cs46xx_adjust_sample_rate (cs46xx_t *chip, cs46xx_pcm_t *cpcm,
int sample_rate) int sample_rate)
{ {
...@@ -1055,7 +1056,6 @@ static int _cs46xx_adjust_sample_rate (cs46xx_t *chip, cs46xx_pcm_t *cpcm, ...@@ -1055,7 +1056,6 @@ static int _cs46xx_adjust_sample_rate (cs46xx_t *chip, cs46xx_pcm_t *cpcm,
cpcm->hw_addr, cpcm->hw_addr,
cpcm->pcm_channel->pcm_channel_id)) == NULL) { cpcm->pcm_channel->pcm_channel_id)) == NULL) {
snd_printk(KERN_ERR "cs46xx: failed to re-create virtual PCM channel\n"); snd_printk(KERN_ERR "cs46xx: failed to re-create virtual PCM channel\n");
up (&chip->spos_mutex);
return -ENXIO; return -ENXIO;
} }
...@@ -1065,6 +1065,8 @@ static int _cs46xx_adjust_sample_rate (cs46xx_t *chip, cs46xx_pcm_t *cpcm, ...@@ -1065,6 +1065,8 @@ static int _cs46xx_adjust_sample_rate (cs46xx_t *chip, cs46xx_pcm_t *cpcm,
return 0; return 0;
} }
#endif
static int snd_cs46xx_playback_hw_params(snd_pcm_substream_t * substream, static int snd_cs46xx_playback_hw_params(snd_pcm_substream_t * substream,
snd_pcm_hw_params_t * hw_params) snd_pcm_hw_params_t * hw_params)
{ {
...@@ -1087,6 +1089,7 @@ static int snd_cs46xx_playback_hw_params(snd_pcm_substream_t * substream, ...@@ -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 || if (cpcm->pcm_channel->pcm_channel_id != DSP_IEC958_CHANNEL ||
!(chip->dsp_spos_instance->spdif_status_out & DSP_SPDIF_STATUS_AC3_MODE)) { !(chip->dsp_spos_instance->spdif_status_out & DSP_SPDIF_STATUS_AC3_MODE)) {
if (_cs46xx_adjust_sample_rate (chip,cpcm,sample_rate)) { if (_cs46xx_adjust_sample_rate (chip,cpcm,sample_rate)) {
up (&chip->spos_mutex);
return -ENXIO; return -ENXIO;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment