OSDN Git Service

ASoC: SOF: Intel: Do not (wrongly) assume positive return value in IMR path
authorPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Wed, 27 Apr 2022 11:51:59 +0000 (14:51 +0300)
committerMark Brown <broonie@kernel.org>
Wed, 27 Apr 2022 13:15:29 +0000 (14:15 +0100)
The cl_dsp_init() returns 0 on success or negative errno on error.
Replace the 'if (ret >= 0)' checks with correct 'if (!ret)` to check for
success.

Fixes: 2a68ff846164 ("ASoC: SOF: Intel: hda: Revisit IMR boot sequence")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20220427115159.26177-1-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sof/intel/hda-loader.c

index 7d4436f..6429012 100644 (file)
@@ -372,7 +372,7 @@ static int hda_dsp_boot_imr(struct snd_sof_dev *sdev)
        int ret;
 
        ret = cl_dsp_init(sdev, 0, true);
-       if (ret >= 0)
+       if (!ret)
                hda_sdw_process_wakeen(sdev);
 
        return ret;
@@ -393,8 +393,8 @@ int hda_dsp_cl_boot_firmware(struct snd_sof_dev *sdev)
                dev_dbg(sdev->dev, "IMR restore supported, booting from IMR directly\n");
                hda->boot_iteration = 0;
                ret = hda_dsp_boot_imr(sdev);
-               if (ret >= 0)
-                       return ret;
+               if (!ret)
+                       return 0;
 
                dev_warn(sdev->dev, "IMR restore failed, trying to cold boot\n");
        }