From: Aaro Koskinen Date: Wed, 29 May 2013 20:59:04 +0000 (+0300) Subject: staging: xgifb: XGI_GetRatePtrCRT2(): delete IF_DEF_LVDS check X-Git-Url: https://rtime.felk.cvut.cz/gitweb/linux-imx.git/commitdiff_plain/b0b4a8a126db9317b6e701af334ff114a224a9d6 staging: xgifb: XGI_GetRatePtrCRT2(): delete IF_DEF_LVDS check IF_DEF_LVDS cannot be set if ProgrammingCRT2 flag is set, so remove the check to simplify the code. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c index bf8bf63250fb..fa85ab1b75ef 100644 --- a/drivers/staging/xgifb/vb_setmode.c +++ b/drivers/staging/xgifb/vb_setmode.c @@ -5290,15 +5290,10 @@ unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE, if (pVBInfo->SetFlag & ProgrammingCRT2) { if (pVBInfo->VBInfo & (SetCRT2ToLCD | XGI_SetCRT2ToLCDA)) { - if (pVBInfo->IF_DEF_LVDS == 0) { - temp = LCDARefreshIndex[ - pVBInfo->LCDResInfo & 0x07]; + temp = LCDARefreshIndex[pVBInfo->LCDResInfo & 0x07]; - if (index > temp) - index = temp; - } else { - index = 0; - } + if (index > temp) + index = temp; } }