From 0abeff663da5a59d133f56780e9bd475b612210a Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Thu, 13 Sep 2012 00:45:42 +0300 Subject: [PATCH] --- yaml --- r: 325279 b: refs/heads/master c: 98f4eade14b4bb077304ca16a1be45ec9c72b381 h: refs/heads/master i: 325277: 2d1a319c79c87bdce6c18ef1645c152e51431b99 325275: 83ea1d7e974a7df7e6a7cff90f72feccba9de45f 325271: 68674c816192d9461e36d06a2b75b352e725b316 325263: dd1db98d97f8e85a4efdedb6f023a8a6780dbe73 325247: 2806517d2c7d97c6e88357aebf7afb1a32bb9e03 v: v3 --- [refs] | 2 +- trunk/drivers/staging/xgifb/XGI_main_26.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 57e482951b14..e767ff5dfd17 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1839c7ebd9363cc73b55ce48d4c3c6823c2fdd42 +refs/heads/master: 98f4eade14b4bb077304ca16a1be45ec9c72b381 diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c index 98b8b096d58c..f775c5453845 100644 --- a/trunk/drivers/staging/xgifb/XGI_main_26.c +++ b/trunk/drivers/staging/xgifb/XGI_main_26.c @@ -6,6 +6,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#include #include #ifdef CONFIG_MTRR @@ -1470,6 +1471,9 @@ static int XGIfb_get_dram_size(struct xgifb_video_info *xgifb_info) xgifb_reg_set(XGISR, IND_SIS_DRAM_SIZE, 0x51); reg = xgifb_reg_get(XGISR, IND_SIS_DRAM_SIZE); + if (!reg) + return -1; + switch ((reg & XGI_DRAM_SIZE_MASK) >> 4) { case XGI_DRAM_SIZE_1MB: xgifb_info->video_size = 0x100000; @@ -1778,10 +1782,8 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, hw_info->jChipType = xgifb_info->chip; if (XGIfb_get_dram_size(xgifb_info)) { - dev_err(&pdev->dev, - "Fatal error: Unable to determine RAM size.\n"); - ret = -ENODEV; - goto error_disable; + xgifb_info->video_size = min_t(unsigned long, video_size_max, + SZ_16M); } else if (xgifb_info->video_size > video_size_max) { xgifb_info->video_size = video_size_max; }