From abfb1306be11caeec29190b063e1494e538f53b6 Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Sun, 11 Sep 2011 00:29:53 +0300 Subject: [PATCH] --- yaml --- r: 268343 b: refs/heads/master c: 3028474cb469ff5352bbc7cc685eee46ab8e888b h: refs/heads/master i: 268341: abf29b1523657a4f6c79eb1d0bd3f2d16e217b9c 268339: 22e8412493053da44150851a63f9f42448ac341f 268335: 4c7ccc8e7de29040b5ff75454fb255c073cd217c v: v3 --- [refs] | 2 +- trunk/drivers/staging/xgifb/XGI_main_26.c | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 78faa1284419..cb09d9f836a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 831e5bad5f74d6147d2d70587a230687181e4e00 +refs/heads/master: 3028474cb469ff5352bbc7cc685eee46ab8e888b diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c index db9d27b04ce4..e018b9a43bc0 100644 --- a/trunk/drivers/staging/xgifb/XGI_main_26.c +++ b/trunk/drivers/staging/xgifb/XGI_main_26.c @@ -2424,13 +2424,19 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, if (register_framebuffer(fb_info) < 0) { ret = -EINVAL; - goto error_1; + goto error_mtrr; } dumpVGAReg(); return 0; +error_mtrr: +#ifdef CONFIG_MTRR + if (xgi_video_info.mtrr >= 0) + mtrr_del(xgi_video_info.mtrr, xgi_video_info.video_base, + xgi_video_info.video_size); +#endif /* CONFIG_MTRR */ error_1: iounmap(xgi_video_info.mmio_vbase); iounmap(xgi_video_info.video_vbase); @@ -2451,6 +2457,11 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, static void __devexit xgifb_remove(struct pci_dev *pdev) { unregister_framebuffer(fb_info); +#ifdef CONFIG_MTRR + if (xgi_video_info.mtrr >= 0) + mtrr_del(xgi_video_info.mtrr, xgi_video_info.video_base, + xgi_video_info.video_size); +#endif /* CONFIG_MTRR */ iounmap(xgi_video_info.mmio_vbase); iounmap(xgi_video_info.video_vbase); release_mem_region(xgi_video_info.mmio_base, xgi_video_info.mmio_size);