From 700dabcee03d56ab624374e890b16c8290317b9b Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Mon, 21 Jan 2013 02:57:48 +0200 Subject: [PATCH] --- yaml --- r: 354103 b: refs/heads/master c: b8e1cc5c8dec9df1b70ca8ec4f081dc31ef69667 h: refs/heads/master i: 354101: 9cd3c9e01f2b10fdfdc499af335220632f6470cb 354099: 78fb11850a7357aca3cb7fd9944b63e315252615 354095: 11f577ba9fd71b8c47faa26482b0832ddbdfaab4 v: v3 --- [refs] | 2 +- trunk/drivers/staging/xgifb/vb_init.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1b2c15b795f5..9ddf68f1c097 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 56810a92c689c64d586a51a1078c5d307b24e8eb +refs/heads/master: b8e1cc5c8dec9df1b70ca8ec4f081dc31ef69667 diff --git a/trunk/drivers/staging/xgifb/vb_init.c b/trunk/drivers/staging/xgifb/vb_init.c index e768ee124896..311541571757 100644 --- a/trunk/drivers/staging/xgifb/vb_init.c +++ b/trunk/drivers/staging/xgifb/vb_init.c @@ -1297,10 +1297,10 @@ unsigned char XGIInitNew(struct pci_dev *pdev) return 0; } - outb(0x67, (pVBInfo->BaseAddr + 0x12)); /* 3c2 <- 67 ,ynlai */ - XGIRegInit(pVBInfo, xgifb_info->vga_base); + outb(0x67, pVBInfo->P3c2); + if (HwDeviceExtension->jChipType < XG20) /* Run XGI_GetVBType before InitTo330Pointer */ XGI_GetVBType(pVBInfo);