ASoC: SOF: Intel: always check the result of acpi_dev_get_first_match…

…_dev() 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. Link: https://lore.kernel.org/alsa-devel/918944d2-3d00-465e-a9d1-5d57fc966113@stanley.mountain/T/#u Reported-by: Dan Carpenter <dan.carpenter@linaro.org> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
thesofproject · Jul 23, 2024 · c7b35fb · c7b35fb
1 parent 0dff6ac
commit c7b35fb
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);