2 files changed, 17 insertions, 12 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
index 32ccc5b8..b12091bf 100644
--- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
@@ -1898,19 +1898,23 @@ void gk20a_gmmu_free_attr(struct gk20a *g, enum dma_attr attr,
                 if (attr) {
                         DEFINE_DMA_ATTRS(attrs);
                         dma_set_attr(attr, &attrs);
-                        if (attr == DMA_ATTR_NO_KERNEL_MAPPING)
-                                dma_free_attrs(d, mem->size, mem->pages,
-                                               sg_dma_address(mem->sgt->sgl),
-                                               &attrs);
-                        else
-                                dma_free_attrs(d, mem->size, mem->cpu_va,
-                                               sg_dma_address(mem->sgt->sgl),
-                                               &attrs);
+                        if (attr == DMA_ATTR_NO_KERNEL_MAPPING) {
+                                if (mem->pages)
+                                        dma_free_attrs(d, mem->size, mem->pages,
+                                                sg_dma_address(mem->sgt->sgl),
+                                                &attrs);
+                        } else {
+                                if (mem->cpu_va)
+                                        dma_free_attrs(d, mem->size,
+                                                mem->cpu_va,
+                                                sg_dma_address(mem->sgt->sgl),
+                                                &attrs);
+                        }
                 } else {
-                        dma_free_coherent(d, mem->size, mem->cpu_va,
-                                  sg_dma_address(mem->sgt->sgl));
+                        if (mem->cpu_va)
+                                dma_free_coherent(d, mem->size, mem->cpu_va,
+                                                sg_dma_address(mem->sgt->sgl));
                 }
-
                 mem->cpu_va = NULL;
                 mem->pages = NULL;
         }
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
index de44f925..77c5da0a 100644
--- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
@@ -2286,7 +2286,8 @@ void gk20a_remove_pmu_support(struct pmu_gk20a *pmu)
 {
         gk20a_dbg_fn("");
 
-        gk20a_allocator_destroy(&pmu->dmem);
+        if (pmu->dmem.init)
+                gk20a_allocator_destroy(&pmu->dmem);
 }
 
 static int gk20a_init_pmu_reset_enable_hw(struct gk20a *g)