From b4abbc64c057ce85c28c7757948563ccc7fc85e6 Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Sun, 27 Nov 2011 23:03:18 +0200 Subject: [PATCH] --- yaml --- r: 281141 b: refs/heads/master c: ebe33024101782b6325dab289e6471a61be923ee h: refs/heads/master i: 281139: 5aeaae38ef4e467da71011eefff8f128c8ecaa24 v: v3 --- [refs] | 2 +- trunk/drivers/staging/xgifb/vb_setmode.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f714d5c19f82..bc31dd249bfd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 337a1a8f7813841745014ab4a9d8672d9253c61f +refs/heads/master: ebe33024101782b6325dab289e6471a61be923ee diff --git a/trunk/drivers/staging/xgifb/vb_setmode.c b/trunk/drivers/staging/xgifb/vb_setmode.c index ad00f2ae0366..0b7800242928 100644 --- a/trunk/drivers/staging/xgifb/vb_setmode.c +++ b/trunk/drivers/staging/xgifb/vb_setmode.c @@ -2312,9 +2312,7 @@ static void *XGI_GetTVPtr(unsigned short BX, unsigned short ModeNo, } /* 07/05/22 */ - if (table == 0x00) { - } else if (table == 0x01) { - } else if (table == 0x04) { + if (table == 0x04) { switch (tempdi[i].DATAPTR) { case 0: return &XGI_ExtPALData[tempal]; @@ -2378,7 +2376,6 @@ static void *XGI_GetTVPtr(unsigned short BX, unsigned short ModeNo, default: break; } - } else if (table == 0x06) { } return NULL; }