diff options
| author | Mark Brown <broonie@kernel.org> | 2015-04-08 21:09:54 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-08 21:09:54 +0100 |
| commit | c77dc2c203908fe03582770b016ffc7c84242939 (patch) | |
| tree | c85e844917bb40dbc9f9dc19cdc10af87f5624ea /sound/soc/omap/omap-twl4030.c | |
| parent | 012baec5c1eaab7ad98b461eb7afae2faf79dbea (diff) | |
| parent | 77c71765ef78f87dd901fcb4c751908e835a3b2e (diff) | |
| download | talos-op-linux-c77dc2c203908fe03582770b016ffc7c84242939.tar.gz talos-op-linux-c77dc2c203908fe03582770b016ffc7c84242939.zip | |
Merge branch 'topic/jack' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-tegra
Diffstat (limited to 'sound/soc/omap/omap-twl4030.c')
| -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; |
