Skip to content

Commit 830f8b9

Browse files
Gerlando FalautoJason Cooper
authored andcommitted
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 <[email protected]> Cc: Andrew Lunn <[email protected]> Cc: Olof Johansson <[email protected]> Cc: Nicolas Pitre <[email protected]> Cc: Holger Brunck <[email protected]> Acked-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
1 parent fd2704e commit 830f8b9

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/arm/plat-orion/mpp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ void __init orion_mpp_conf(unsigned int *mpp_list, unsigned int variant_mask,
4949
"number (%u)\n", num);
5050
continue;
5151
}
52-
if (variant_mask & !(*mpp_list & variant_mask)) {
52+
if (variant_mask && !(*mpp_list & variant_mask)) {
5353
printk(KERN_WARNING
5454
"orion_mpp_conf: requested MPP%u config "
5555
"unavailable on this hardware\n", num);

0 commit comments

Comments
 (0)