* [PATCH] Revert "cpufreq: brcmstb-avs-cpufreq: Fix initial command check"
@ 2024-10-29 15:22 Colin Ian King
2024-10-29 17:06 ` Florian Fainelli
0 siblings, 1 reply; 3+ messages in thread
From: Colin Ian King @ 2024-10-29 15:22 UTC (permalink / raw)
To: Markus Mayer, bcm-kernel-feedback-list, Rafael J . Wysocki,
Viresh Kumar, Florian Fainelli, linux-pm, linux-arm-kernel
Cc: linux-kernel, stable
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 22a26cc6a51ef73dcfeb64c50513903f6b2d53d8.
Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
---
drivers/cpufreq/brcmstb-avs-cpufreq.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/cpufreq/brcmstb-avs-cpufreq.c b/drivers/cpufreq/brcmstb-avs-cpufreq.c
index 5d03a295a085..2fd0f6be6fa3 100644
--- a/drivers/cpufreq/brcmstb-avs-cpufreq.c
+++ b/drivers/cpufreq/brcmstb-avs-cpufreq.c
@@ -474,8 +474,8 @@ static bool brcm_avs_is_firmware_loaded(struct private_data *priv)
rc = brcm_avs_get_pmap(priv, NULL);
magic = readl(priv->base + AVS_MBOX_MAGIC);
- return (magic == AVS_FIRMWARE_MAGIC) && ((rc != -ENOTSUPP) ||
- (rc != -EINVAL));
+ return (magic == AVS_FIRMWARE_MAGIC) && (rc != -ENOTSUPP) &&
+ (rc != -EINVAL);
}
static unsigned int brcm_avs_cpufreq_get(unsigned int cpu)
--
2.39.5
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Revert "cpufreq: brcmstb-avs-cpufreq: Fix initial command check"
2024-10-29 15:22 [PATCH] Revert "cpufreq: brcmstb-avs-cpufreq: Fix initial command check" Colin Ian King
@ 2024-10-29 17:06 ` Florian Fainelli
2024-10-30 3:16 ` Viresh Kumar
0 siblings, 1 reply; 3+ messages in thread
From: Florian Fainelli @ 2024-10-29 17:06 UTC (permalink / raw)
To: Colin Ian King, Markus Mayer, bcm-kernel-feedback-list,
Rafael J . Wysocki, Viresh Kumar, linux-pm, linux-arm-kernel
Cc: linux-kernel, stable
On 10/29/24 08:22, Colin Ian King wrote:
> 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 22a26cc6a51ef73dcfeb64c50513903f6b2d53d8.
>
> Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
Acked-by: Florian Fainelli <florian.fainelli@broadcom.com>
Sorry for not replying earlier on.
--
Florian
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Revert "cpufreq: brcmstb-avs-cpufreq: Fix initial command check"
2024-10-29 17:06 ` Florian Fainelli
@ 2024-10-30 3:16 ` Viresh Kumar
0 siblings, 0 replies; 3+ messages in thread
From: Viresh Kumar @ 2024-10-30 3:16 UTC (permalink / raw)
To: Florian Fainelli
Cc: Colin Ian King, Markus Mayer, bcm-kernel-feedback-list,
Rafael J . Wysocki, linux-pm, linux-arm-kernel, linux-kernel,
stable
On 29-10-24, 10:06, Florian Fainelli wrote:
> On 10/29/24 08:22, Colin Ian King wrote:
> > 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 22a26cc6a51ef73dcfeb64c50513903f6b2d53d8.
> >
> > Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
>
> Acked-by: Florian Fainelli <florian.fainelli@broadcom.com>
Applied. Thanks.
--
viresh
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-10-30 3:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-10-29 15:22 [PATCH] Revert "cpufreq: brcmstb-avs-cpufreq: Fix initial command check" Colin Ian King
2024-10-29 17:06 ` Florian Fainelli
2024-10-30 3:16 ` Viresh Kumar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®