From b8e1cc5c8dec9df1b70ca8ec4f081dc31ef69667 Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Mon, 21 Jan 2013 02:57:48 +0200 Subject: [PATCH] staging: xgifb: do not use pVBInfo->BaseAddr Use pre-calculated register addresses instead of pVBInfo->BaseAddr. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/xgifb/vb_init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c index e768ee124896..311541571757 100644 --- a/drivers/staging/xgifb/vb_init.c +++ b/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);