Unverified Commit d98bf889 authored by Mark Brown's avatar Mark Brown
Browse files

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

sound/soc/codecs/rt1015.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

sound/soc/sof/ipc.c

+1 −1
Original line number Diff line number Diff line
@@ -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",