diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2015-03-04 10:33:39 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-04 17:10:46 +0000 |
| commit | 3fd94f37da000a2b562a3f4e6c553b7ab1ad9e19 (patch) | |
| tree | 29d94f59b5122fcae83e343ad2c22888fd600a6d | |
| parent | 663976ad478b50664353fdf19a5a3dcad3cb4e22 (diff) | |
| download | lwn-3fd94f37da000a2b562a3f4e6c553b7ab1ad9e19.tar.gz lwn-3fd94f37da000a2b562a3f4e6c553b7ab1ad9e19.zip | |
ASoC: tobermory: 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/tobermory.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sound/soc/samsung/tobermory.c b/sound/soc/samsung/tobermory.c index 9c80506527c4..85ccfb7188cb 100644 --- a/sound/soc/samsung/tobermory.c +++ b/sound/soc/samsung/tobermory.c @@ -179,15 +179,10 @@ static int tobermory_late_probe(struct snd_soc_card *card) if (ret < 0) return ret; - ret = snd_soc_jack_new(codec, "Headset", - SND_JACK_HEADSET | SND_JACK_BTN_0, - &tobermory_headset); - if (ret) - return ret; - - ret = snd_soc_jack_add_pins(&tobermory_headset, - ARRAY_SIZE(tobermory_headset_pins), - tobermory_headset_pins); + ret = snd_soc_card_jack_new(card, "Headset", SND_JACK_HEADSET | + SND_JACK_BTN_0, &tobermory_headset, + tobermory_headset_pins, + ARRAY_SIZE(tobermory_headset_pins)); if (ret) return ret; |