Merge tag 'staging-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[sfrench/cifs-2.6.git] / drivers / staging / greybus / audio_codec.c

diff --git a/drivers/staging/greybus/audio_codec.c b/drivers/staging/greybus/audio_codec.c
index dc030caa64bae6751e0666a09ed3620c2178db8e..0ad8aeabccbfdd52afd75c5989b9e26744c0221c 100644 (file)
--- a/drivers/staging/greybus/audio_codec.c
+++ b/drivers/staging/greybus/audio_codec.c
@@ -706,8 +706,9 @@ static int gbaudio_init_jack(struct gbaudio_module_info *module,
 
        headset->pin = module->jack_name;
        headset->mask = module->jack_mask;
-       ret = snd_soc_card_jack_new(card, module->jack_name, module->jack_mask,
-                                   &module->headset.jack, headset, 1);
+       ret = snd_soc_card_jack_new_pins(card, module->jack_name,
+                                        module->jack_mask,
+                                        &module->headset.jack, headset, 1);
        if (ret) {
                dev_err(module->dev, "Failed to create new jack\n");
                return ret;
@@ -729,9 +730,10 @@ static int gbaudio_init_jack(struct gbaudio_module_info *module,
 
        button->pin = module->button_name;
        button->mask = module->button_mask;
-       ret = snd_soc_card_jack_new(card, module->button_name,
-                                   module->button_mask, &module->button.jack,
-                                   button, 1);
+       ret = snd_soc_card_jack_new_pins(card, module->button_name,
+                                        module->button_mask,
+                                        &module->button.jack,
+                                        button, 1);
        if (ret) {
                dev_err(module->dev, "Failed to create button jack\n");
                goto free_jacks;