From 9cf3d9331569e245723c6a0bbf889d9d1c66e134 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Sat, 23 May 2009 10:41:05 +0100 Subject: [PATCH] --- yaml --- r: 148313 b: refs/heads/master c: 08d15f034e94251606479d7ca9070994c2e2fcf0 h: refs/heads/master i: 148311: 64d30655bf5348234d215574d16ba2db5ed818bd v: v3 --- [refs] | 2 +- trunk/sound/soc/fsl/fsl_ssi.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 2441e03bf27d..fa6e4e802592 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0c0e09e21a9e7bc6ca54e06ef3d497255ca26383 +refs/heads/master: 08d15f034e94251606479d7ca9070994c2e2fcf0 diff --git a/trunk/sound/soc/fsl/fsl_ssi.c b/trunk/sound/soc/fsl/fsl_ssi.c index 47afaa9747ac..93f0f38a32c9 100644 --- a/trunk/sound/soc/fsl/fsl_ssi.c +++ b/trunk/sound/soc/fsl/fsl_ssi.c @@ -375,18 +375,14 @@ static int fsl_ssi_startup(struct snd_pcm_substream *substream, struct snd_pcm_runtime *first_runtime = ssi_private->first_stream->runtime; - if (!first_runtime->rate || !first_runtime->sample_bits) { + if (!first_runtime->sample_bits) { dev_err(substream->pcm->card->dev, - "set sample rate and size in %s stream first\n", + "set sample size in %s stream first\n", substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? "capture" : "playback"); return -EAGAIN; } - snd_pcm_hw_constraint_minmax(substream->runtime, - SNDRV_PCM_HW_PARAM_RATE, - first_runtime->rate, first_runtime->rate); - /* If we're in synchronous mode, then we need to constrain * the sample size as well. We don't support independent sample * rates in asynchronous mode. @@ -693,6 +689,7 @@ struct snd_soc_dai *fsl_ssi_create_dai(struct fsl_ssi_info *ssi_info) fsl_ssi_dai->name = ssi_private->name; fsl_ssi_dai->id = ssi_info->id; fsl_ssi_dai->dev = ssi_info->dev; + fsl_ssi_dai->symmetric_rates = 1; ret = snd_soc_register_dai(fsl_ssi_dai); if (ret != 0) {