summaryrefslogtreecommitdiff
path: root/sound/soc/sof
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2023-02-16 17:06:18 +0300
committerTakashi Iwai <tiwai@suse.de>2023-02-16 17:06:18 +0300
commit7933b90b42896f5b6596e6a829bb31c5121fc2a9 (patch)
treebab4d4fee7ce8199416d0666739052811c593089 /sound/soc/sof
parent1bdb78368f9448cf0de9b11eb1388e887d1b4849 (diff)
parent82f1627cb6339ee32db22c89c750c0e359e5c72e (diff)
downloadlinux-7933b90b42896f5b6596e6a829bb31c5121fc2a9.tar.xz
Merge branch 'for-linus' into for-next
Pull the pending fixes for 6.3 Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc/sof')
-rw-r--r--sound/soc/sof/ops.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/sof/ops.h b/sound/soc/sof/ops.h
index 03752c8405ca..9ab7b9be765b 100644
--- 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;