Skip to content

Commit 96b9764

Browse files
ColinIanKingvireshk
authored andcommitted
Revert "cpufreq: brcmstb-avs-cpufreq: Fix initial command check"
Currently the condition ((rc != -ENOTSUPP) || (rc != -EINVAL)) is always true because rc cannot be equal to two different values at the same time, so it must be not equal to at least one of them. Fix the original commit that introduced the issue. This reverts commit 22a26cc. Signed-off-by: Colin Ian King <[email protected]> Acked-by: Florian Fainelli <[email protected]> Signed-off-by: Viresh Kumar <[email protected]>
1 parent 00dd2b2 commit 96b9764

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/cpufreq/brcmstb-avs-cpufreq.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -474,8 +474,8 @@ static bool brcm_avs_is_firmware_loaded(struct private_data *priv)
474474
rc = brcm_avs_get_pmap(priv, NULL);
475475
magic = readl(priv->base + AVS_MBOX_MAGIC);
476476

477-
return (magic == AVS_FIRMWARE_MAGIC) && ((rc != -ENOTSUPP) ||
478-
(rc != -EINVAL));
477+
return (magic == AVS_FIRMWARE_MAGIC) && (rc != -ENOTSUPP) &&
478+
(rc != -EINVAL);
479479
}
480480

481481
static unsigned int brcm_avs_cpufreq_get(unsigned int cpu)

0 commit comments

Comments
 (0)