|
@@ -1128,13 +1128,14 @@ static int snd_pcm_oss_get_active_substream(struct snd_pcm_oss_file *pcm_oss_fil
|
|
}
|
|
}
|
|
|
|
|
|
/* call with params_lock held */
|
|
/* call with params_lock held */
|
|
|
|
+/* NOTE: this always call PREPARE unconditionally no matter whether
|
|
|
|
+ * runtime->oss.prepare is set or not
|
|
|
|
+ */
|
|
static int snd_pcm_oss_prepare(struct snd_pcm_substream *substream)
|
|
static int snd_pcm_oss_prepare(struct snd_pcm_substream *substream)
|
|
{
|
|
{
|
|
int err;
|
|
int err;
|
|
struct snd_pcm_runtime *runtime = substream->runtime;
|
|
struct snd_pcm_runtime *runtime = substream->runtime;
|
|
|
|
|
|
- if (!runtime->oss.prepare)
|
|
|
|
- return 0;
|
|
|
|
err = snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_PREPARE, NULL);
|
|
err = snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_PREPARE, NULL);
|
|
if (err < 0) {
|
|
if (err < 0) {
|
|
pcm_dbg(substream->pcm,
|
|
pcm_dbg(substream->pcm,
|