From b66a056e1539d8470013fff00f476377a616baa3 Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Thu, 13 Aug 2020 15:01:35 -0500
Subject: [PATCH] ASoC: Intel: Atom: sst_loader: remove always-true condition
References: jsc#SLE-16518
Patch-mainline: v5.10-rc1
Git-commit: b66a056e1539d8470013fff00f476377a616baa3
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>
Acked-by: Takashi Iwai <tiwai@suse.de>
---
sound/soc/intel/atom/sst/sst_loader.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sound/soc/intel/atom/sst/sst_loader.c b/sound/soc/intel/atom/sst/sst_loader.c
index fc91a304256b..5c42cce90ce2 100644
--- a/sound/soc/intel/atom/sst/sst_loader.c
+++ b/sound/soc/intel/atom/sst/sst_loader.c
@@ -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) {
--
2.16.4