staging: xgifb: properly delete MTRR region

MTRR region should be deleted on probe failure and driver removal.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index db9d27b04ce4bfa48ac05a7d5ec00cd6d8a19bef..e018b9a43bc06d853217ea8e3b958b4bc1c21d54 100644 (file)
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/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 @@ error:
 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);