Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

[platform/kernel/linux-rpi.git] / drivers / net / ethernet / netronome / nfp / nfp_asm.c

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_asm.c b/drivers/net/ethernet/netronome/nfp/nfp_asm.c
index 2643ea5..154399c 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/nfp_asm.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_asm.c
@@ -196,7 +196,7 @@ int swreg_to_unrestricted(swreg dst, swreg lreg, swreg rreg,
        }
 
        reg->dst_lmextn = swreg_lmextn(dst);
-       reg->src_lmextn = swreg_lmextn(lreg) | swreg_lmextn(rreg);
+       reg->src_lmextn = swreg_lmextn(lreg) || swreg_lmextn(rreg);
 
        return 0;
 }
@@ -277,7 +277,7 @@ int swreg_to_restricted(swreg dst, swreg lreg, swreg rreg,
        }
 
        reg->dst_lmextn = swreg_lmextn(dst);
-       reg->src_lmextn = swreg_lmextn(lreg) | swreg_lmextn(rreg);
+       reg->src_lmextn = swreg_lmextn(lreg) || swreg_lmextn(rreg);
 
        return 0;
 }