diff options
| author | Gerlando Falauto <gerlando.falauto@keymile.com> | 2013-01-23 14:50:59 +0100 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2013-01-23 14:37:52 +0000 |
| commit | 830f8b9105b2d88cd2b115994e14bfe992f9a000 (patch) | |
| tree | cd8c4a2b1b2c57d703d0ff4f937f61c84fad7400 /arch/arm | |
| parent | fd2704e82daa93923921dd1c9052ead74b2fdc79 (diff) | |
| download | linux-830f8b9105b2d88cd2b115994e14bfe992f9a000.tar.bz2 | |
arm: plat-orion: fix printing of "MPP config unavailable on this hardware"
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>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/plat-orion/mpp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-orion/mpp.c b/arch/arm/plat-orion/mpp.c index e686fe76a96b..7310bcfb299f 100644 --- a/arch/arm/plat-orion/mpp.c +++ b/arch/arm/plat-orion/mpp.c @@ -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); |