]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
staging: xgifb: move AND operator for logical continuation
authorGargi Sharma <gs051095@gmail.com>
Thu, 15 Sep 2016 19:07:09 +0000 (00:37 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 16 Sep 2016 08:27:52 +0000 (10:27 +0200)
Move && up to the previous line, to fix the checkpatch issue Logical
continuations should be on the previous line.

Signed-off-by: Gargi Sharma <gs051095@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/xgifb/vb_setmode.c

index 50c8ea4f5ab79c547507c2d29833ff72b817b33d..316209ff983559ad0100434004ae13684383fa46 100644 (file)
@@ -1741,8 +1741,8 @@ static void XGI_SetCRT2ECLK(unsigned short ModeIdIndex,
        for (i = 0; i < 4; i++) {
                xgifb_reg_and_or(pVBInfo->P3d4, 0x31, ~0x30,
                                (unsigned short) (0x10 * i));
-               if ((!(pVBInfo->VBInfo & XGI_SetCRT2ToLCDA))
-                               && (!(pVBInfo->VBInfo & SetInSlaveMode))) {
+               if ((!(pVBInfo->VBInfo & XGI_SetCRT2ToLCDA)) &&
+                               (!(pVBInfo->VBInfo & SetInSlaveMode))) {
                        xgifb_reg_set(pVBInfo->P3c4, 0x2e, di_0);
                        xgifb_reg_set(pVBInfo->P3c4, 0x2f, di_1);
                } else {
@@ -4141,8 +4141,8 @@ static void XGI_SetGroup4(unsigned short ModeIdIndex,
                                        | TVSetYPbPr525p | TVSetYPbPr750p
                                        | TVSetHiVision))) {
                                temp |= 0x0001;
-                               if ((pVBInfo->VBInfo & SetInSlaveMode)
-                                               && (!(pVBInfo->TVInfo
+                               if ((pVBInfo->VBInfo & SetInSlaveMode) &&
+                                               (!(pVBInfo->TVInfo
                                                                & TVSimuMode)))
                                        temp &= (~0x0001);
                        }