Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik...

[~andy/linux] / drivers / gpu / drm / cirrus / cirrus_ttm.c

diff --git a/drivers/gpu/drm/cirrus/cirrus_ttm.c b/drivers/gpu/drm/cirrus/cirrus_ttm.c
index 2ebcd11a5023089a3a7a8d890c08e3a673184860..50e170f879dece492968752212068ebec4ad14d3 100644 (file)
--- a/drivers/gpu/drm/cirrus/cirrus_ttm.c
+++ b/drivers/gpu/drm/cirrus/cirrus_ttm.c
@@ -275,12 +275,17 @@ int cirrus_mm_init(struct cirrus_device *cirrus)
                                    pci_resource_len(dev->pdev, 0),
                                    DRM_MTRR_WC);
 
+       cirrus->mm_inited = true;
        return 0;
 }
 
 void cirrus_mm_fini(struct cirrus_device *cirrus)
 {
        struct drm_device *dev = cirrus->dev;
+
+       if (!cirrus->mm_inited)
+               return;
+
        ttm_bo_device_release(&cirrus->ttm.bdev);
 
        cirrus_ttm_global_release(cirrus);