mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
[ALSA] rme96 - Fix OSS full-duplex
Fixed a bug in rme96 driver that the full-duplex on OSS emulation doesn't work due to the invalid period size parameter. Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
62fe78e90d
commit
2ce7fb579f
1 changed files with 23 additions and 9 deletions
|
@ -1151,6 +1151,25 @@ static struct snd_pcm_hw_constraint_list hw_constraints_period_bytes = {
|
||||||
.mask = 0
|
.mask = 0
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static void
|
||||||
|
rme96_set_buffer_size_constraint(struct rme96 *rme96,
|
||||||
|
struct snd_pcm_runtime *runtime)
|
||||||
|
{
|
||||||
|
unsigned int size;
|
||||||
|
|
||||||
|
snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_BYTES,
|
||||||
|
RME96_BUFFER_SIZE, RME96_BUFFER_SIZE);
|
||||||
|
if ((size = rme96->playback_periodsize) != 0 ||
|
||||||
|
(size = rme96->capture_periodsize) != 0)
|
||||||
|
snd_pcm_hw_constraint_minmax(runtime,
|
||||||
|
SNDRV_PCM_HW_PARAM_PERIOD_BYTES,
|
||||||
|
size, size);
|
||||||
|
else
|
||||||
|
snd_pcm_hw_constraint_list(runtime, 0,
|
||||||
|
SNDRV_PCM_HW_PARAM_PERIOD_BYTES,
|
||||||
|
&hw_constraints_period_bytes);
|
||||||
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
snd_rme96_playback_spdif_open(struct snd_pcm_substream *substream)
|
snd_rme96_playback_spdif_open(struct snd_pcm_substream *substream)
|
||||||
{
|
{
|
||||||
|
@ -1180,8 +1199,7 @@ snd_rme96_playback_spdif_open(struct snd_pcm_substream *substream)
|
||||||
runtime->hw.rate_min = rate;
|
runtime->hw.rate_min = rate;
|
||||||
runtime->hw.rate_max = rate;
|
runtime->hw.rate_max = rate;
|
||||||
}
|
}
|
||||||
snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, RME96_BUFFER_SIZE, RME96_BUFFER_SIZE);
|
rme96_set_buffer_size_constraint(rme96, runtime);
|
||||||
snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, &hw_constraints_period_bytes);
|
|
||||||
|
|
||||||
rme96->wcreg_spdif_stream = rme96->wcreg_spdif;
|
rme96->wcreg_spdif_stream = rme96->wcreg_spdif;
|
||||||
rme96->spdif_ctl->vd[0].access &= ~SNDRV_CTL_ELEM_ACCESS_INACTIVE;
|
rme96->spdif_ctl->vd[0].access &= ~SNDRV_CTL_ELEM_ACCESS_INACTIVE;
|
||||||
|
@ -1219,9 +1237,7 @@ snd_rme96_capture_spdif_open(struct snd_pcm_substream *substream)
|
||||||
rme96->capture_substream = substream;
|
rme96->capture_substream = substream;
|
||||||
spin_unlock_irq(&rme96->lock);
|
spin_unlock_irq(&rme96->lock);
|
||||||
|
|
||||||
snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, RME96_BUFFER_SIZE, RME96_BUFFER_SIZE);
|
rme96_set_buffer_size_constraint(rme96, runtime);
|
||||||
snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, &hw_constraints_period_bytes);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1254,8 +1270,7 @@ snd_rme96_playback_adat_open(struct snd_pcm_substream *substream)
|
||||||
runtime->hw.rate_min = rate;
|
runtime->hw.rate_min = rate;
|
||||||
runtime->hw.rate_max = rate;
|
runtime->hw.rate_max = rate;
|
||||||
}
|
}
|
||||||
snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, RME96_BUFFER_SIZE, RME96_BUFFER_SIZE);
|
rme96_set_buffer_size_constraint(rme96, runtime);
|
||||||
snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, &hw_constraints_period_bytes);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1291,8 +1306,7 @@ snd_rme96_capture_adat_open(struct snd_pcm_substream *substream)
|
||||||
rme96->capture_substream = substream;
|
rme96->capture_substream = substream;
|
||||||
spin_unlock_irq(&rme96->lock);
|
spin_unlock_irq(&rme96->lock);
|
||||||
|
|
||||||
snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, RME96_BUFFER_SIZE, RME96_BUFFER_SIZE);
|
rme96_set_buffer_size_constraint(rme96, runtime);
|
||||||
snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, &hw_constraints_period_bytes);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue