diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2015-03-04 10:33:27 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-04 17:10:39 +0000 |
| commit | da21cf6d65283680247da74c3d03f7e5cdfb40d1 (patch) | |
| tree | f4302517d884f7c42a4db2382ecebe6c02d3ab46 /sound | |
| parent | 25649592cfa6c210c9f86670472b864782c8d677 (diff) | |
| download | blackbird-op-linux-da21cf6d65283680247da74c3d03f7e5cdfb40d1.tar.gz blackbird-op-linux-da21cf6d65283680247da74c3d03f7e5cdfb40d1.zip | |
ASoC: omap-twl4030: 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>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/omap/omap-twl4030.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sound/soc/omap/omap-twl4030.c b/sound/soc/omap/omap-twl4030.c index fb1f6bb87cd4..3673ada43bfb 100644 --- a/sound/soc/omap/omap-twl4030.c +++ b/sound/soc/omap/omap-twl4030.c @@ -170,14 +170,10 @@ static int omap_twl4030_init(struct snd_soc_pcm_runtime *rtd) if (priv->jack_detect > 0) { hs_jack_gpios[0].gpio = priv->jack_detect; - ret = snd_soc_jack_new(codec, "Headset Jack", SND_JACK_HEADSET, - &priv->hs_jack); - if (ret) - return ret; - - ret = snd_soc_jack_add_pins(&priv->hs_jack, - ARRAY_SIZE(hs_jack_pins), - hs_jack_pins); + ret = snd_soc_card_jack_new(rtd->card, "Headset Jack", + SND_JACK_HEADSET, &priv->hs_jack, + hs_jack_pins, + ARRAY_SIZE(hs_jack_pins)); if (ret) return ret; |
