diff --git a/[refs] b/[refs] index f1694388afe8..c06a87f4dcf1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dc625537f7d4301a7e3f6a8476bd624b09508488 +refs/heads/master: df3d90e5f3f09e5bc940250e2a90a7e15343a4b6 diff --git a/trunk/drivers/gpu/drm/exynos/exynos_drm_g2d.c b/trunk/drivers/gpu/drm/exynos/exynos_drm_g2d.c index c1054cb2fe06..6ffa0763c078 100644 --- a/trunk/drivers/gpu/drm/exynos/exynos_drm_g2d.c +++ b/trunk/drivers/gpu/drm/exynos/exynos_drm_g2d.c @@ -319,8 +319,8 @@ static void g2d_userptr_put_dma_addr(struct drm_device *drm_dev, g2d_userptr->sgt = NULL; kfree(g2d_userptr->pages); - kfree(g2d_userptr); g2d_userptr->pages = NULL; + kfree(g2d_userptr); g2d_userptr = NULL; }