Revert "ASoC: SOF: Intel: hda: use fallback for firmware name"

BugLink: https://bugs.launchpad.net/bugs/1860642
This reverts commit a3b3ae27bd4f31ff5d21f14c6cac4dd2db1b54b0.
This series is causing suspend/resume failures on some laptops.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
index 640de978b3ff5723a8fdb71b6c5595aabf9a209e..48847a860f0b0825f2c4dd924afcda38f63cf54f 100644 (file)
--- a/sound/soc/sof/intel/hda.c
+++ b/sound/soc/sof/intel/hda.c
@@ -422,16 +422,9 @@ static int hda_init_caps(struct snd_sof_dev *sdev)
                        pdata->tplg_filename =
                                hda_mach->sof_tplg_filename;
 
-                       /*
-                        * firmware: pick the first in machine list,
-                        * or use nocodec firmware name if list is empty
-                        */
+                       /* firmware: pick the first in machine list */
                        mach = pdata->desc->machines;
-                       if (mach->id[0])
-                               pdata->fw_filename = mach->sof_fw_filename;
-                       else
-                               pdata->fw_filename =
-                                       pdata->desc->nocodec_fw_filename;
+                       pdata->fw_filename = mach->sof_fw_filename;
 
                        dev_info(bus->dev, "using HDA machine driver %s now\n",
                                 hda_mach->drv_name);