Commit 96b97648 authored by Colin Ian King's avatar Colin Ian King Committed by Viresh Kumar
Browse files

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 22a26cc6.

Signed-off-by: default avatarColin Ian King <colin.i.king@gmail.com>
Acked-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent 00dd2b28

drivers/cpufreq/brcmstb-avs-cpufreq.c

+2 −2
Original line number Diff line number Diff line
@@ -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)