Commit 28d98f8c authored by Walt Feasel's avatar Walt Feasel Committed by Greg Kroah-Hartman

staging: xgifb: XGI_main_26.c Logical continuation

Make suggested checkpatch modification for
CHECK: Logical continuations should be on the previous line
Signed-off-by: default avatarWalt Feasel <waltfeasel@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 569e5c9d
...@@ -231,11 +231,11 @@ static int XGIfb_GetXG21DefaultLVDSModeIdx(struct xgifb_video_info *xgifb_info) ...@@ -231,11 +231,11 @@ static int XGIfb_GetXG21DefaultLVDSModeIdx(struct xgifb_video_info *xgifb_info)
{ {
int i = 0; int i = 0;
while ((XGIbios_mode[i].mode_no != 0) while ((XGIbios_mode[i].mode_no != 0) &&
&& (XGIbios_mode[i].xres <= xgifb_info->lvds_data.LVDSHDE)) { (XGIbios_mode[i].xres <= xgifb_info->lvds_data.LVDSHDE)) {
if ((XGIbios_mode[i].xres == xgifb_info->lvds_data.LVDSHDE) if ((XGIbios_mode[i].xres == xgifb_info->lvds_data.LVDSHDE) &&
&& (XGIbios_mode[i].yres == xgifb_info->lvds_data.LVDSVDE) (XGIbios_mode[i].yres == xgifb_info->lvds_data.LVDSVDE) &&
&& (XGIbios_mode[i].bpp == 8)) { (XGIbios_mode[i].bpp == 8)) {
return i; return i;
} }
i++; i++;
...@@ -384,9 +384,8 @@ static int XGIfb_validate_mode(struct xgifb_video_info *xgifb_info, int myindex) ...@@ -384,9 +384,8 @@ static int XGIfb_validate_mode(struct xgifb_video_info *xgifb_info, int myindex)
return -1; return -1;
break; break;
case 640: case 640:
if ((XGIbios_mode[myindex].yres != 400) if ((XGIbios_mode[myindex].yres != 400) &&
&& (XGIbios_mode[myindex].yres (XGIbios_mode[myindex].yres != 480))
!= 480))
return -1; return -1;
break; break;
case 800: case 800:
...@@ -1344,9 +1343,8 @@ static int XGIfb_pan_display(struct fb_var_screeninfo *var, ...@@ -1344,9 +1343,8 @@ static int XGIfb_pan_display(struct fb_var_screeninfo *var,
if (var->vmode & FB_VMODE_YWRAP) { if (var->vmode & FB_VMODE_YWRAP) {
if (var->yoffset >= info->var.yres_virtual || var->xoffset) if (var->yoffset >= info->var.yres_virtual || var->xoffset)
return -EINVAL; return -EINVAL;
} else if (var->xoffset + info->var.xres > info->var.xres_virtual } else if (var->xoffset + info->var.xres > info->var.xres_virtual ||
|| var->yoffset + info->var.yres var->yoffset + info->var.yres > info->var.yres_virtual) {
> info->var.yres_virtual) {
return -EINVAL; return -EINVAL;
} }
err = XGIfb_pan_var(var, info); err = XGIfb_pan_var(var, info);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment