diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2015-03-04 10:33:25 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-04 17:10:26 +0000 |
| commit | df8c66189dd42f719c75800a526bdc901f300f41 (patch) | |
| tree | d594ee277336e494e3133fc0cd6642ce8618bb80 /sound/soc/omap/ams-delta.c | |
| parent | af13cbc1a288d3921f1af739da84371e6c53aea3 (diff) | |
| download | linux-df8c66189dd42f719c75800a526bdc901f300f41.tar.gz linux-df8c66189dd42f719c75800a526bdc901f300f41.tar.bz2 linux-df8c66189dd42f719c75800a526bdc901f300f41.zip | |
ASoC: ams-deltea: 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>
Diffstat (limited to 'sound/soc/omap/ams-delta.c')
| -rw-r--r-- | sound/soc/omap/ams-delta.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c index 706613077c15..16cc95fa4573 100644 --- a/sound/soc/omap/ams-delta.c +++ b/sound/soc/omap/ams-delta.c @@ -479,8 +479,8 @@ static int ams_delta_cx20442_init(struct snd_soc_pcm_runtime *rtd) /* Add hook switch - can be used to control the codec from userspace * even if line discipline fails */ - ret = snd_soc_jack_new(rtd->codec, "hook_switch", - SND_JACK_HEADSET, &ams_delta_hook_switch); + ret = snd_soc_card_jack_new(card, "hook_switch", SND_JACK_HEADSET, + &ams_delta_hook_switch, NULL, 0); if (ret) dev_warn(card->dev, "Failed to allocate resources for hook switch, " |