ASoC: Intel: boards: always check the result of acpi_dev_get_first_match_dev()

[ Upstream commit 14e91ddd5c02d8c3e5a682ebfa0546352b459911 ]

The code seems mostly copy-pasted, with some machine drivers
forgetting to test if the 'adev' result is NULL.

Add this check when missing, and use -ENOENT consistently as an error
code.

Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/alsa-devel/918944d2-3d00-465e-a9d1-5d57fc966113@stanley.mountain/T/#u
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://patch.msgid.link/20240827123215.258859-4-yung-chuan.liao@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/sound/soc/intel/boards/bytcht_cx2072x.c b/sound/soc/intel/boards/bytcht_cx2072x.c
index df3c2a7b64d23c0fdb44c095875a45d3ad17ed6c..8c2b4ab764bbafd0f8a8a8f9ca89f73613a7231f 100644 (file)
--- a/sound/soc/intel/boards/bytcht_cx2072x.c
+++ b/sound/soc/intel/boards/bytcht_cx2072x.c
@@ -255,7 +255,11 @@ static int snd_byt_cht_cx2072x_probe(struct platform_device *pdev)
                snprintf(codec_name, sizeof(codec_name), "i2c-%s",
                         acpi_dev_name(adev));
                byt_cht_cx2072x_dais[dai_index].codecs->name = codec_name;
+       } else {
+               dev_err(&pdev->dev, "Error cannot find '%s' dev\n", mach->id);
+               return -ENOENT;
        }
+
        acpi_dev_put(adev);
 
        /* override platform name, if required */

diff --git a/sound/soc/intel/boards/bytcht_da7213.c b/sound/soc/intel/boards/bytcht_da7213.c
index 08c598b7e1eeeba7eae64264f4baba22a180e511..9178bbe8d9950683c8bed0c2da7f559eea1c6ee2 100644 (file)
--- a/sound/soc/intel/boards/bytcht_da7213.c
+++ b/sound/soc/intel/boards/bytcht_da7213.c
@@ -258,7 +258,11 @@ static int bytcht_da7213_probe(struct platform_device *pdev)
                snprintf(codec_name, sizeof(codec_name),
                         "i2c-%s", acpi_dev_name(adev));
                dailink[dai_index].codecs->name = codec_name;
+       } else {
+               dev_err(&pdev->dev, "Error cannot find '%s' dev\n", mach->id);
+               return -ENOENT;
        }
+
        acpi_dev_put(adev);
 
        /* override platform name, if required */

diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c
index 77b91ea4dc32ca3cd65e3e6c21fc4a717dbeb1c4..3539c9ff0fd2ca6ea57a4cf6e4243f2531bba4b8 100644 (file)
--- a/sound/soc/intel/boards/bytcht_es8316.c
+++ b/sound/soc/intel/boards/bytcht_es8316.c
@@ -562,7 +562,7 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev)
                byt_cht_es8316_dais[dai_index].codecs->name = codec_name;
        } else {
                dev_err(dev, "Error cannot find '%s' dev\n", mach->id);
-               return -ENXIO;
+               return -ENOENT;
        }
 
        codec_dev = acpi_get_first_physical_node(adev);

diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c
index db4a33680d9488fa34701555dcc8febfd99cb445..4479825c08b5e3af4d40c359ece3e0c06a715155 100644 (file)
--- a/sound/soc/intel/boards/bytcr_rt5640.c
+++ b/sound/soc/intel/boards/bytcr_rt5640.c
@@ -1693,7 +1693,7 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)
                byt_rt5640_dais[dai_index].codecs->name = byt_rt5640_codec_name;
        } else {
                dev_err(dev, "Error cannot find '%s' dev\n", mach->id);
-               return -ENXIO;
+               return -ENOENT;
        }
 
        codec_dev = acpi_get_first_physical_node(adev);

diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c
index 8514b79f389bb53ab9a9385ce712c1eb02b3d70f..1f54da98aacf47c6d0f4a68ad7ea2dfc03ca5dfc 100644 (file)
--- a/sound/soc/intel/boards/bytcr_rt5651.c
+++ b/sound/soc/intel/boards/bytcr_rt5651.c
@@ -926,7 +926,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)
                byt_rt5651_dais[dai_index].codecs->name = byt_rt5651_codec_name;
        } else {
                dev_err(dev, "Error cannot find '%s' dev\n", mach->id);
-               return -ENXIO;
+               return -ENOENT;
        }
 
        codec_dev = acpi_get_first_physical_node(adev);

diff --git a/sound/soc/intel/boards/cht_bsw_rt5645.c b/sound/soc/intel/boards/cht_bsw_rt5645.c
index 1da9ceee4d593ea43a08ac62086c9b22deb2165b..ac23a8b7cafca2c4074d159b8f829c17c5401b75 100644 (file)
--- a/sound/soc/intel/boards/cht_bsw_rt5645.c
+++ b/sound/soc/intel/boards/cht_bsw_rt5645.c
@@ -582,7 +582,11 @@ static int snd_cht_mc_probe(struct platform_device *pdev)
                snprintf(cht_rt5645_codec_name, sizeof(cht_rt5645_codec_name),
                         "i2c-%s", acpi_dev_name(adev));
                cht_dailink[dai_index].codecs->name = cht_rt5645_codec_name;
+       } else {
+               dev_err(&pdev->dev, "Error cannot find '%s' dev\n", mach->id);
+               return -ENOENT;
        }
+
        /* acpi_get_first_physical_node() returns a borrowed ref, no need to deref */
        codec_dev = acpi_get_first_physical_node(adev);
        acpi_dev_put(adev);

diff --git a/sound/soc/intel/boards/cht_bsw_rt5672.c b/sound/soc/intel/boards/cht_bsw_rt5672.c
index d68e5bc755dee52439954db6b0e46af91af2cf9a..c6c469d51243ef189d99dc1d44a637f20aa93cca 100644 (file)
--- a/sound/soc/intel/boards/cht_bsw_rt5672.c
+++ b/sound/soc/intel/boards/cht_bsw_rt5672.c
@@ -479,7 +479,11 @@ static int snd_cht_mc_probe(struct platform_device *pdev)
                snprintf(drv->codec_name, sizeof(drv->codec_name),
                         "i2c-%s", acpi_dev_name(adev));
                cht_dailink[dai_index].codecs->name = drv->codec_name;
+       }  else {
+               dev_err(&pdev->dev, "Error cannot find '%s' dev\n", mach->id);
+               return -ENOENT;
        }
+
        acpi_dev_put(adev);
 
        /* Use SSP0 on Bay Trail CR devices */

diff --git a/sound/soc/intel/boards/sof_es8336.c b/sound/soc/intel/boards/sof_es8336.c
index c1fcc156a5752c24909afb0326205528fdbdc0bb..809532238c44fdc9725901d3864d4df4657defa0 100644 (file)
--- a/sound/soc/intel/boards/sof_es8336.c
+++ b/sound/soc/intel/boards/sof_es8336.c
@@ -681,7 +681,7 @@ static int sof_es8336_probe(struct platform_device *pdev)
                        dai_links[0].codecs->dai_name = "ES8326 HiFi";
        } else {
                dev_err(dev, "Error cannot find '%s' dev\n", mach->id);
-               return -ENXIO;
+               return -ENOENT;
        }
 
        codec_dev = acpi_get_first_physical_node(adev);

diff --git a/sound/soc/intel/boards/sof_wm8804.c b/sound/soc/intel/boards/sof_wm8804.c
index 4cb0d463bf404912e94c4f58dc1cf4bfc76bd66b..9c5b3f8f09f364866849033ab1d6bcd0f5771b0c 100644 (file)
--- a/sound/soc/intel/boards/sof_wm8804.c
+++ b/sound/soc/intel/boards/sof_wm8804.c
@@ -270,7 +270,11 @@ static int sof_wm8804_probe(struct platform_device *pdev)
                snprintf(codec_name, sizeof(codec_name),
                         "%s%s", "i2c-", acpi_dev_name(adev));
                dailink[dai_index].codecs->name = codec_name;
+       } else {
+               dev_err(&pdev->dev, "Error cannot find '%s' dev\n", mach->id);
+               return -ENOENT;
        }
+
        acpi_dev_put(adev);
 
        snd_soc_card_set_drvdata(card, ctx);