1 files changed, 4 insertions, 1 deletions

diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 141a302e4e77..e7f16b54a97d 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -158,7 +158,10 @@ static void soc_pcm_init_runtime_hw(struct snd_pcm_hardware *hw,
                 cpu_stream->channels_min);
         hw->channels_max = min(codec_stream->channels_max,
                 cpu_stream->channels_max);
-        hw->formats = codec_stream->formats & cpu_stream->formats;
+        if (hw->formats)
+                hw->formats &= codec_stream->formats & cpu_stream->formats;
+        else
+                hw->formats = codec_stream->formats & cpu_stream->formats;
         hw->rates = codec_stream->rates & cpu_stream->rates;
         if (codec_stream->rates
                 & (SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_CONTINUOUS))