arm: plat-orion: fix printing of "MPP config unavailable on this hardware"
authorGerlando Falauto <gerlando.falauto@keymile.com>
Wed, 23 Jan 2013 13:50:59 +0000 (14:50 +0100)
committerJason Cooper <jason@lakedaemon.net>
Wed, 23 Jan 2013 14:37:52 +0000 (14:37 +0000)
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 not be printed) if
variant_mask != 1

Signed-off-by: Gerlando Falauto <gerlando.falauto@keymile.com>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Olof Johansson <olof@lixom.net>
Cc: Nicolas Pitre <nico@linaro.org>
Cc: Holger Brunck <holger.brunck@keymile.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
arch/arm/plat-orion/mpp.c

index e686fe76a96b169c705322fcf2419844cabb76d2..7310bcfb299f8228a8ec6cd1e0a1666402425d89 100644 (file)
@@ -49,7 +49,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);