diff options
| author | Mark Brown <broonie@kernel.org> | 2020-03-04 13:38:36 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-03-04 13:38:36 +0000 |
| commit | d98bf8894bfbff7c1899a5d050106b287b12182e (patch) | |
| tree | 2c410a572846f7565169a298eab7cfccd77e569f | |
| parent | 14beaccc36dc9c1afbe6da627b873bf1d6849234 (diff) | |
| parent | 613cea5935e83cb5a7d182ee3f98d54620e102e2 (diff) | |
Merge branch 'for-5.6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.7
| -rw-r--r-- | sound/soc/codecs/rt1015.c | 2 | ||||
| -rw-r--r-- | sound/soc/sof/ipc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/rt1015.c b/sound/soc/codecs/rt1015.c index 5fa21d8ab620..bb310bc7febd 100644 --- a/sound/soc/codecs/rt1015.c +++ b/sound/soc/codecs/rt1015.c @@ -664,7 +664,7 @@ static int rt1015_hw_params(struct snd_pcm_substream *substream, snd_soc_component_update_bits(component, RT1015_TDM_MASTER, RT1015_I2S_DL_MASK, val_len); 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; } diff --git a/sound/soc/sof/ipc.c b/sound/soc/sof/ipc.c index cc5762706c9c..1c6794918cbb 100644 --- a/sound/soc/sof/ipc.c +++ b/sound/soc/sof/ipc.c @@ -526,7 +526,7 @@ int snd_sof_ipc_stream_posn(struct snd_soc_component *scomp, /* send IPC to the DSP */ err = sof_ipc_tx_message(sdev->ipc, - stream.hdr.cmd, &stream, sizeof(stream), &posn, + stream.hdr.cmd, &stream, sizeof(stream), posn, sizeof(*posn)); if (err < 0) { dev_err(sdev->dev, "error: failed to get stream %d position\n", |