1 files changed, 15 insertions, 10 deletions

diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index f7c6734bd5da..c49a408fc7a6 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -176,11 +176,11 @@ static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd)
                 return ret;
 
         if (gpio_is_valid(priv->gpio_hp_det)) {
-                snd_soc_jack_new(codec->codec, "Headphones", SND_JACK_HEADPHONE,
-                                 &simple_card_hp_jack);
-                snd_soc_jack_add_pins(&simple_card_hp_jack,
-                                      ARRAY_SIZE(simple_card_hp_jack_pins),
-                                      simple_card_hp_jack_pins);
+                snd_soc_card_jack_new(rtd->card, "Headphones",
+                                      SND_JACK_HEADPHONE,
+                                      &simple_card_hp_jack,
+                                      simple_card_hp_jack_pins,
+                                      ARRAY_SIZE(simple_card_hp_jack_pins));
 
                 simple_card_hp_jack_gpio.gpio = priv->gpio_hp_det;
                 simple_card_hp_jack_gpio.invert = priv->gpio_hp_det_invert;
@@ -189,11 +189,11 @@ static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd)
         }
 
         if (gpio_is_valid(priv->gpio_mic_det)) {
-                snd_soc_jack_new(codec->codec, "Mic Jack", SND_JACK_MICROPHONE,
-                                 &simple_card_mic_jack);
-                snd_soc_jack_add_pins(&simple_card_mic_jack,
-                                      ARRAY_SIZE(simple_card_mic_jack_pins),
-                                      simple_card_mic_jack_pins);
+                snd_soc_card_jack_new(rtd->card, "Mic Jack",
+                                      SND_JACK_MICROPHONE,
+                                      &simple_card_mic_jack,
+                                      simple_card_mic_jack_pins,
+                                      ARRAY_SIZE(simple_card_mic_jack_pins));
                 simple_card_mic_jack_gpio.gpio = priv->gpio_mic_det;
                 simple_card_mic_jack_gpio.invert = priv->gpio_mic_det_invert;
                 snd_soc_jack_add_gpios(&simple_card_mic_jack, 1,
@@ -372,6 +372,11 @@ static int asoc_simple_card_dai_link_of(struct device_node *node,
                             strlen(dai_link->cpu_dai_name)   +
                             strlen(dai_link->codec_dai_name) + 2,
                             GFP_KERNEL);
+        if (!name) {
+                ret = -ENOMEM;
+                goto dai_link_of_err;
+        }
+
         sprintf(name, "%s-%s", dai_link->cpu_dai_name,
                                 dai_link->codec_dai_name);
         dai_link->name = dai_link->stream_name = name;