[PATCH] arm: plat-orion: fix printing of "MPP config unavailable on this hardware"
Gerlando Falauto
gerlando.falauto at keymile.com
Wed Jan 23 08:50:59 EST 2013
Commit 3cff484d4b264ff467a3b45c544cbbbab69f0bf8
ARM: dove: Consolidate mpp code with platform mpp.
refactored printing of the kernel warning
"orion_mpp_conf: requested MPP%u config unavailable on this hardware\n"
which is not to be printed in case of variant_mask = 0 (unknown variant).
This check should be performed using a logical AND (&&) as opposed
to a bitwise AND (&).
Otherwise, test would fail (and message would be printed) if variant_mask != 1
Signed-off-by: Gerlando Falauto <gerlando.falauto at keymile.com>
Cc: Andrew Lunn <andrew at lunn.ch>
Cc: Olof Johansson <olof at lixom.net>
Cc: Nicolas Pitre <nico at linaro.org>
Cc: Holger Brunck <holger.brunck at keymile.com>
---
arch/arm/plat-orion/mpp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/plat-orion/mpp.c b/arch/arm/plat-orion/mpp.c
index 3b1e17b..78ea76c 100644
--- a/arch/arm/plat-orion/mpp.c
+++ b/arch/arm/plat-orion/mpp.c
@@ -48,7 +48,7 @@ void __init orion_mpp_conf(unsigned int *mpp_list, unsigned int variant_mask,
"number (%u)\n", num);
continue;
}
- if (variant_mask & !(*mpp_list & variant_mask)) {
+ if (variant_mask && !(*mpp_list & variant_mask)) {
printk(KERN_WARNING
"orion_mpp_conf: requested MPP%u config "
"unavailable on this hardware\n", num);
--
1.7.10.1
More information about the linux-arm-kernel
mailing list