]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
drm/prime: fix sgt NULL checking
authorJoonyoung Shim <jy0922.shim@samsung.com>
Thu, 4 Jul 2013 07:19:12 +0000 (16:19 +0900)
committerDave Airlie <airlied@redhat.com>
Fri, 5 Jul 2013 05:36:20 +0000 (15:36 +1000)
The drm_gem_map_detach() can be called with sgt is NULL.

Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/drm_prime.c

index 1e0de41f085c2419863ee5c462d6cbf54ce77c8a..ff5fecef367b45f068ec35e635798dca53275a17 100644 (file)
@@ -119,12 +119,13 @@ static void drm_gem_map_detach(struct dma_buf *dma_buf,
                return;
 
        sgt = prime_attach->sgt;
+       if (sgt) {
+               if (prime_attach->dir != DMA_NONE)
+                       dma_unmap_sg(attach->dev, sgt->sgl, sgt->nents,
+                                       prime_attach->dir);
+               sg_free_table(sgt);
+       }
 
-       if (prime_attach->dir != DMA_NONE)
-               dma_unmap_sg(attach->dev, sgt->sgl, sgt->nents,
-                               prime_attach->dir);
-
-       sg_free_table(sgt);
        kfree(sgt);
        kfree(prime_attach);
        attach->priv = NULL;