diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2015-03-04 04:33:34 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-03-04 12:10:44 -0500 |
commit | 39ec5109d6089e1acd04b51b9df5349f5b8a7f5c (patch) | |
tree | d6c306262ac1084e3dbec685727ac5910aeacb3b | |
parent | dfe11f282c61808f7140d9dd741f7e54cf97cda6 (diff) |
ASoC: littlemill: Register jacks at the card level
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>
-rw-r--r-- | sound/soc/samsung/littlemill.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/samsung/littlemill.c b/sound/soc/samsung/littlemill.c index 141519c21e21..31a820eb0ac3 100644 --- a/sound/soc/samsung/littlemill.c +++ b/sound/soc/samsung/littlemill.c | |||
@@ -260,12 +260,12 @@ static int littlemill_late_probe(struct snd_soc_card *card) | |||
260 | if (ret < 0) | 260 | if (ret < 0) |
261 | return ret; | 261 | return ret; |
262 | 262 | ||
263 | ret = snd_soc_jack_new(codec, "Headset", | 263 | ret = snd_soc_card_jack_new(card, "Headset", |
264 | SND_JACK_HEADSET | SND_JACK_MECHANICAL | | 264 | SND_JACK_HEADSET | SND_JACK_MECHANICAL | |
265 | SND_JACK_BTN_0 | SND_JACK_BTN_1 | | 265 | SND_JACK_BTN_0 | SND_JACK_BTN_1 | |
266 | SND_JACK_BTN_2 | SND_JACK_BTN_3 | | 266 | SND_JACK_BTN_2 | SND_JACK_BTN_3 | |
267 | SND_JACK_BTN_4 | SND_JACK_BTN_5, | 267 | SND_JACK_BTN_4 | SND_JACK_BTN_5, |
268 | &littlemill_headset); | 268 | &littlemill_headset, NULL, 0); |
269 | if (ret) | 269 | if (ret) |
270 | return ret; | 270 | return ret; |
271 | 271 | ||