aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/soc/soc-pcm.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index b649e32791df..feb0f2843026 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -1235,7 +1235,10 @@ static void dpcm_init_runtime_hw(struct snd_pcm_runtime *runtime,
1235 runtime->hw.rate_max = stream->rate_max; 1235 runtime->hw.rate_max = stream->rate_max;
1236 runtime->hw.channels_min = stream->channels_min; 1236 runtime->hw.channels_min = stream->channels_min;
1237 runtime->hw.channels_max = stream->channels_max; 1237 runtime->hw.channels_max = stream->channels_max;
1238 runtime->hw.formats &= stream->formats; 1238 if (runtime->hw.formats)
1239 runtime->hw.formats &= stream->formats;
1240 else
1241 runtime->hw.formats = stream->formats;
1239 runtime->hw.rates = stream->rates; 1242 runtime->hw.rates = stream->rates;
1240} 1243}
1241 1244