Merge tag 'asoc-fix-v6.2-rc8' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

tiwai · tiwai · commit 82f1627cb633 · 2023-02-16T14:29:54.000+01:00
ASoC: Fix for v6.2

One non-urgent fix for v6.2, this could possibly wait till the
merge window.
diff --git a/sound/soc/sof/ops.h b/sound/soc/sof/ops.h
@@ -357,7 +357,7 @@ static inline u64 snd_sof_dsp_read64(struct snd_sof_dev *sdev, u32 bar,
 }
 
 static inline void snd_sof_dsp_update8(struct snd_sof_dev *sdev, u32 bar,
-				       u32 offset, u8 value, u8 mask)
+				       u32 offset, u8 mask, u8 value)
 {
 	u8 reg;
 

Original file line number	Diff line number	Diff line change
`@@ -357,7 +357,7 @@ static inline u64 snd_sof_dsp_read64(struct snd_sof_dev *sdev, u32 bar,`
`357`	`357`	`}`
`358`	`358`
`359`	`359`	`static inline void snd_sof_dsp_update8(struct snd_sof_dev *sdev, u32 bar,`
`360`		`- u32 offset, u8 value, u8 mask)`
	`360`	`+ u32 offset, u8 mask, u8 value)`
`361`	`361`	`{`
`362`	`362`	`u8 reg;`
`363`	`363`