---

yaml --- r: 354529 b: refs/heads/master c: 053004b h: refs/heads/master i: 354527: 4e60ead v: v3
git-mirror · Feb 15, 2013 · 7d4c5de · 7d4c5de
1 parent 4a4f670
commit 7d4c5de
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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,