summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-pcm.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index b7c90da1820e..37094aeff440 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -1531,12 +1531,10 @@ static void dpcm_init_runtime_hw(struct snd_pcm_runtime *runtime,
{
struct snd_pcm_hardware *hw = &runtime->hw;
+ soc_pcm_hw_init(hw);
soc_pcm_hw_update_rate(hw, stream);
soc_pcm_hw_update_chan(hw, stream);
- if (runtime->hw.formats)
- runtime->hw.formats &= stream->formats;
- else
- runtime->hw.formats = stream->formats;
+ soc_pcm_hw_update_format(hw, stream);
}
static void dpcm_runtime_merge_format(struct snd_pcm_substream *substream,