6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <redacted>
[ Upstream commit 6723670a483501497dc339ae37676525245a913a ]
The id object passed to snd_ctl_find_id() is only read, and we can
mark it with const gracefully.
Link: https://lore.kernel.org/r/20230718141304.1032-9-tiwai@suse.de (local)
Signed-off-by: Takashi Iwai <redacted>
Stable-dep-of: 74e3b979ce8b ("ALSA: control: Don't add invalid kcontrols to LED layer")
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
include/sound/control.h | 2 +-
sound/core/control.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/sound/control.h b/include/sound/control.h
index cc3dcc6cfb0f2..e61b749bf2041 100644
--- a/include/sound/control.h
+++ b/include/sound/control.h
@@ -141,7 +141,7 @@ int snd_ctl_rename_id(struct snd_card * card, struct snd_ctl_elem_id *src_id, st
void snd_ctl_rename(struct snd_card *card, struct snd_kcontrol *kctl, const char *name);
int snd_ctl_activate_id(struct snd_card *card, struct snd_ctl_elem_id *id, int active);
struct snd_kcontrol *snd_ctl_find_numid(struct snd_card * card, unsigned int numid);
-struct snd_kcontrol *snd_ctl_find_id(struct snd_card * card, struct snd_ctl_elem_id *id);
+struct snd_kcontrol *snd_ctl_find_id(struct snd_card *card, const struct snd_ctl_elem_id *id);
int snd_ctl_create(struct snd_card *card);
diff --git a/sound/core/control.c b/sound/core/control.c
index 41b178ac25d87..54b9aa5dd9865 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -829,7 +829,7 @@ EXPORT_SYMBOL(snd_ctl_find_numid);
*
*/
struct snd_kcontrol *snd_ctl_find_id(struct snd_card *card,
- struct snd_ctl_elem_id *id)
+ const struct snd_ctl_elem_id *id)
{
struct snd_kcontrol *kctl;
--
2.53.0