Commit d98bf889 authored by Mark Brown's avatar Mark Brown

Merge branch 'for-5.6' of...

Merge branch 'for-5.6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.7
parents 14beaccc 613cea59
...@@ -664,7 +664,7 @@ static int rt1015_hw_params(struct snd_pcm_substream *substream, ...@@ -664,7 +664,7 @@ static int rt1015_hw_params(struct snd_pcm_substream *substream,
snd_soc_component_update_bits(component, RT1015_TDM_MASTER, snd_soc_component_update_bits(component, RT1015_TDM_MASTER,
RT1015_I2S_DL_MASK, val_len); RT1015_I2S_DL_MASK, val_len);
snd_soc_component_update_bits(component, RT1015_CLK2, snd_soc_component_update_bits(component, RT1015_CLK2,
RT1015_FS_PD_MASK, pre_div); RT1015_FS_PD_MASK, pre_div << RT1015_FS_PD_SFT);
return 0; return 0;
} }
......
...@@ -526,7 +526,7 @@ int snd_sof_ipc_stream_posn(struct snd_soc_component *scomp, ...@@ -526,7 +526,7 @@ int snd_sof_ipc_stream_posn(struct snd_soc_component *scomp,
/* send IPC to the DSP */ /* send IPC to the DSP */
err = sof_ipc_tx_message(sdev->ipc, err = sof_ipc_tx_message(sdev->ipc,
stream.hdr.cmd, &stream, sizeof(stream), &posn, stream.hdr.cmd, &stream, sizeof(stream), posn,
sizeof(*posn)); sizeof(*posn));
if (err < 0) { if (err < 0) {
dev_err(sdev->dev, "error: failed to get stream %d position\n", dev_err(sdev->dev, "error: failed to get stream %d position\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment