From 7d4c5de3346e4f3750bed676b2a716f3a7a3ef1e Mon Sep 17 00:00:00 2001
From: Peter Huewe <peterhuewe@gmx.de>
Date: Fri, 15 Feb 2013 20:37:12 +0100
Subject: [PATCH] --- yaml --- r: 354529 b: refs/heads/master c:
 053004b375ca8f684f778d354eeeaf4e8b17c1f0 h: refs/heads/master i:   354527:
 4e60ead5c40735c2b51a3e3c8fd006dba4b9960a v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/staging/xgifb/vb_setmode.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index a9d67046e802..c8e0d88911c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 516354e0b458c3c16555364e105bdee5cd1cf5f1
+refs/heads/master: 053004b375ca8f684f778d354eeeaf4e8b17c1f0
diff --git a/trunk/drivers/staging/xgifb/vb_setmode.c b/trunk/drivers/staging/xgifb/vb_setmode.c
index a602d435ca01..edbe70ba1a91 100644
--- a/trunk/drivers/staging/xgifb/vb_setmode.c
+++ b/trunk/drivers/staging/xgifb/vb_setmode.c
@@ -2860,10 +2860,8 @@ static unsigned short XGI_GetOffset(unsigned short ModeNo,
 		temp = 0x6B;
 		if (infoflag & InterlaceMode)
 			temp = temp << 1;
-		return temp * colordepth;
-	} else {
-		return temp * colordepth;
 	}
+	return temp * colordepth;
 }
 
 static void XGI_SetCRT2Offset(unsigned short ModeNo,