diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2015-03-04 10:33:33 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-04 17:10:44 +0000 |
| commit | dfe11f282c61808f7140d9dd741f7e54cf97cda6 (patch) | |
| tree | 0278d95a3216e57466325d08a30299d80295d238 | |
| parent | d30d141f9cb7eb9fb3f03af11146dc0d2b393ff2 (diff) | |
| download | blackbird-op-linux-dfe11f282c61808f7140d9dd741f7e54cf97cda6.tar.gz blackbird-op-linux-dfe11f282c61808f7140d9dd741f7e54cf97cda6.zip | |
ASoC: h1980_uda1380: 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/h1940_uda1380.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sound/soc/samsung/h1940_uda1380.c b/sound/soc/samsung/h1940_uda1380.c index 59b044255b78..c72e9fb26658 100644 --- a/sound/soc/samsung/h1940_uda1380.c +++ b/sound/soc/samsung/h1940_uda1380.c @@ -162,13 +162,8 @@ static struct platform_device *s3c24xx_snd_device; static int h1940_uda1380_init(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_codec *codec = rtd->codec; - - snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE, - &hp_jack); - - snd_soc_jack_add_pins(&hp_jack, ARRAY_SIZE(hp_jack_pins), - hp_jack_pins); + snd_soc_card_jack_new(rtd->card, "Headphone Jack", SND_JACK_HEADPHONE, + &hp_jack, hp_jack_pins, ARRAY_SIZE(hp_jack_pins)); snd_soc_jack_add_gpios(&hp_jack, ARRAY_SIZE(hp_jack_gpios), hp_jack_gpios); |
