]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ASoC: littlemill: Register jacks at the card level
authorLars-Peter Clausen <lars@metafoo.de>
Wed, 4 Mar 2015 09:33:34 +0000 (10:33 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 4 Mar 2015 17:10:44 +0000 (17:10 +0000)
The jacks are card level elements so use snd_soc_card_jack_new() instead of
snd_soc_jack_new() to register them.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/samsung/littlemill.c

index 141519c21e21d7cbd425cb7b9a6d306278cabdf0..31a820eb0ac37b52992cbc986a17ce11d3c42ca1 100644 (file)
@@ -260,12 +260,12 @@ static int littlemill_late_probe(struct snd_soc_card *card)
        if (ret < 0)
                return ret;
 
-       ret = snd_soc_jack_new(codec, "Headset",
-                              SND_JACK_HEADSET | SND_JACK_MECHANICAL |
-                              SND_JACK_BTN_0 | SND_JACK_BTN_1 |
-                              SND_JACK_BTN_2 | SND_JACK_BTN_3 |
-                              SND_JACK_BTN_4 | SND_JACK_BTN_5,
-                              &littlemill_headset);
+       ret = snd_soc_card_jack_new(card, "Headset",
+                                   SND_JACK_HEADSET | SND_JACK_MECHANICAL |
+                                   SND_JACK_BTN_0 | SND_JACK_BTN_1 |
+                                   SND_JACK_BTN_2 | SND_JACK_BTN_3 |
+                                   SND_JACK_BTN_4 | SND_JACK_BTN_5,
+                                   &littlemill_headset, NULL, 0);
        if (ret)
                return ret;