ASoC: Intel: bytcht_es8316: move comment to the right place
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Tue, 8 Mar 2022 19:26:10 +0000 (13:26 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 9 Feb 2023 10:26:32 +0000 (11:26 +0100)
[ Upstream commit fe0596a006081bc963874d4f3d38cd0b1b5e46d4 ]

Additional code was added and the comment on the speaker GPIO needs to
be moved before we actually try to get the GPIO.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20220308192610.392950-21-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Stable-dep-of: 6b1c0bd6fdef ("ASoC: Intel: bytcht_es8316: Drop reference count of ACPI device after use")
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/intel/boards/bytcht_es8316.c

index 78b7e24b0c79eca6e6c24fe81af3c4696b67b614..95058398b1be5e13cb748b9d67d363b80760ddd8 100644 (file)
@@ -542,7 +542,6 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev)
        if (IS_ERR(priv->mclk))
                return dev_err_probe(dev, PTR_ERR(priv->mclk), "clk_get pmc_plt_clk_3 failed\n");
 
-       /* get speaker enable GPIO */
        codec_dev = acpi_get_first_physical_node(adev);
        if (!codec_dev)
                return -EPROBE_DEFER;
@@ -568,6 +567,7 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev)
                }
        }
 
+       /* get speaker enable GPIO */
        devm_acpi_dev_add_driver_gpios(codec_dev, byt_cht_es8316_gpios);
        priv->speaker_en_gpio =
                gpiod_get_optional(codec_dev, "speaker-enable",