Merge tag 'uapi-prep-20121002' of git://git.infradead.org/users/dhowells/linux-headers

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / exynos / exynos_drm_g2d.c

diff --git a/drivers/gpu/drm/exynos/exynos_drm_g2d.c b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
index 1f4f240580dc85a89644daf1540039ac06a92156..bc2a2e9be8ebc59852be751332e873e827633c1a 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
@@ -878,7 +878,7 @@ static int g2d_suspend(struct device *dev)
                /* FIXME: good range? */
                usleep_range(500, 1000);
 
-       flush_work_sync(&g2d->runqueue_work);
+       flush_work(&g2d->runqueue_work);
 
        return 0;
 }