diff options
| author | Akihiko Odaki <akihiko.odaki@gmail.com> | 2022-04-08 06:11:14 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-04-14 18:37:21 +0200 |
| commit | 19aed2d6cdb72a7c92909832b9480d9cadebeef9 (patch) | |
| tree | 405c75c54a6dc39655717c69f80734734b459d43 /sound/soc/fsl/imx-hdmi.c | |
| parent | ASoC: SOF: Intel: Check the bar size before remapping (diff) | |
| download | linux-19aed2d6cdb72a7c92909832b9480d9cadebeef9.tar.xz linux-19aed2d6cdb72a7c92909832b9480d9cadebeef9.zip | |
ASoC: soc-card: Create jack kcontrol without pins
snd_soc_card_jack_new() allowed to create jack kcontrol without pins,
but did not create kcontrols. The jack would not have kcontrols if pins
were not going to be added.
This renames the old snd_soc_card_jack_new() to
snd_soc_card_jack_new_pins() for use when pins are provided or will be
added later. The new snd_soc_card_jack_new() appropriately creates a
jack for use without pins and adds a kcontrol.
Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Link: https://lore.kernel.org/r/20220408041114.6024-1-akihiko.odaki@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/fsl/imx-hdmi.c')
| -rw-r--r-- | sound/soc/fsl/imx-hdmi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/fsl/imx-hdmi.c b/sound/soc/fsl/imx-hdmi.c index 929f69b758af..e10136afa741 100644 --- a/sound/soc/fsl/imx-hdmi.c +++ b/sound/soc/fsl/imx-hdmi.c @@ -78,8 +78,9 @@ static int imx_hdmi_init(struct snd_soc_pcm_runtime *rtd) data->hdmi_jack_pin.pin = "HDMI Jack"; data->hdmi_jack_pin.mask = SND_JACK_LINEOUT; /* enable jack detection */ - ret = snd_soc_card_jack_new(card, "HDMI Jack", SND_JACK_LINEOUT, - &data->hdmi_jack, &data->hdmi_jack_pin, 1); + ret = snd_soc_card_jack_new_pins(card, "HDMI Jack", SND_JACK_LINEOUT, + &data->hdmi_jack, + &data->hdmi_jack_pin, 1); if (ret) { dev_err(card->dev, "Can't new HDMI Jack %d\n", ret); return ret; |