diff --git a/[refs] b/[refs]
index 1db767da3a6f..2afa91762bdc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 95605332997211f377af55d05209c3ef2b86bed1
+refs/heads/master: 2f123cbcf0ddaf526bd681081a1f2fe8c30ef59a
diff --git a/trunk/drivers/staging/xgifb/vb_init.c b/trunk/drivers/staging/xgifb/vb_init.c
index 80dba6a425ba..fdb7d1a78b3b 100644
--- a/trunk/drivers/staging/xgifb/vb_init.c
+++ b/trunk/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);