OSDN Git Service

ASoC: Intel: Atom: sst_loader: remove always-true condition
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Thu, 13 Aug 2020 20:01:35 +0000 (15:01 -0500)
committerMark Brown <broonie@kernel.org>
Tue, 18 Aug 2020 10:50:15 +0000 (11:50 +0100)
Fix cppcheck warning:

sound/soc/intel/atom/sst/sst_loader.c:401:43: style: Redundant
condition: If 'EXPR == 4', the comparison 'EXPR != 3' is always
true. [redundantCondition]

 if (sst_drv_ctx->sst_state !=  SST_RESET ||
                                          ^

In this case, if sst_state == SST_SHUTDOWN then the first test is
already true. 2014 bug, yay.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20200813200147.61990-10-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/atom/sst/sst_loader.c

index fc91a30..5c42cce 100644 (file)
@@ -398,8 +398,7 @@ int sst_load_fw(struct intel_sst_drv *sst_drv_ctx)
 
        dev_dbg(sst_drv_ctx->dev, "sst_load_fw\n");
 
-       if (sst_drv_ctx->sst_state !=  SST_RESET ||
-                       sst_drv_ctx->sst_state == SST_SHUTDOWN)
+       if (sst_drv_ctx->sst_state !=  SST_RESET)
                return -EAGAIN;
 
        if (!sst_drv_ctx->fw_in_mem) {