ALSA: hda - Fix invalid function call in snd_hda_add_vmaster()
PATCH 1/1 ALSA: hda - Fix invalid function call in snd_hda_add_vmaster()
The recent commit [6194b99d: ALSA: hda - Kill the rest of snd_print*() usages] changed the callback map_slaves(), but one call was forgotten to be replaced due to the cast, which leads to kernel Oops due to invalid function. This patch replaces it with a proper function.
Fixes 6194b99de9f5 ('ALSA: hda - Kill the rest of snd_print*() usages')
Signed-off-by Takashi Iwai <[email protected]>
--- sound/pci/hda/hda_codec.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
sound/pci/hda/hda_codec.c +7 -2
@@ -2831,6 +2831,12 @@ static int init_slave_unmute(struct hda_codec *codec,return put_kctl_with_value (slave,1 ); } +static int add_slave (struct hda_codec *codec, +void *data,struct snd_kcontrol *slave) +{ +return snd_ctl_add_slave (data, slave); +} +/** * snd_hda_add_vmaster - create a virtual master control and add slaves * @codec: HD-audio codec
@@ -2873,8 +2879,7 @@ int __snd_hda_add_vmaster(struct hda_codec *codec, char *name,if (err <0 )return err; - err =map_slaves (codec, slaves, suffix, - (map_slave_func_t )snd_ctl_add_slave, kctl); + err =map_slaves (codec, slaves, suffix, add_slave, kctl);if (err <0 )return err;
Signature · 1 line
2.0.0