diff options
| author | Peter Huewe <peterhuewe@gmx.de> | 2013-02-15 20:37:09 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-15 15:12:39 -0800 |
| commit | 66b43eb25759b5bf76465c97107dc45b73eeb0e3 (patch) | |
| tree | 3de196fe9c26bb12d6a0f28cc6e8a3011b3d6d70 /drivers/staging/xgifb | |
| parent | 4e9b5e2b8b7f1a9116d760a25f8ea98b3d5b64f4 (diff) | |
staging/xgifb: Consolidate if/else if with identical code branches
Both branches of this if statement execute the same code.
Thus we can || them together and remove code duplication
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/xgifb')
| -rw-r--r-- | drivers/staging/xgifb/vb_setmode.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c index 3d5c4244c80..0b134af4a9c 100644 --- a/drivers/staging/xgifb/vb_setmode.c +++ b/drivers/staging/xgifb/vb_setmode.c @@ -5572,13 +5572,10 @@ static void XGI_EnableBridge(struct xgifb_video_info *xgifb_info, if (pVBInfo->VBType & (VB_SIS301B | VB_SIS302B | VB_SIS301LV | VB_SIS302LV | VB_XGI301C)) { if (!(pVBInfo->SetFlag & DisableChA)) { - if (pVBInfo->SetFlag & EnableChA) { + if ((pVBInfo->SetFlag & EnableChA) || + (pVBInfo->VBInfo & SetCRT2ToDualEdge)) { /* Power on */ xgifb_reg_set(pVBInfo->Part1Port, 0x1E, 0x20); - } else if (pVBInfo->VBInfo & SetCRT2ToDualEdge) { - /* Power on */ - xgifb_reg_set(pVBInfo->Part1Port, - 0x1E, 0x20); } } |