Staging: xgifb: fix bitwise vs logical bug

This is a static checker fix and not something I can test.  The intent
of the code here is to set some bit flags.  For a logical OR the ">> 1"
shift wouldn't make a difference.  So it should be using a bitwise OR.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c
index 80dba6a425baa75171ec7bc9659a0176bc72d656..fdb7d1a78b3b614d250238cf7da80c161d2cfd6e 100644 (file)
--- a/drivers/staging/xgifb/vb_init.c
+++ b/drivers/staging/xgifb/vb_init.c
@@ -1269,7 +1269,7 @@ static unsigned char GetXG27FPBits(struct vb_device_info *pVBInfo)
        if (temp <= 2)
                temp &= 0x03;
        else
-               temp = ((temp & 0x04) >> 1) || ((~temp) & 0x01);
+               temp = ((temp & 0x04) >> 1) | ((~temp) & 0x01);
 
        xgifb_reg_set(pVBInfo->P3d4, 0x4A, CR4A);