Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

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

diff --git a/drivers/gpu/drm/exynos/exynos_drm_rotator.c b/drivers/gpu/drm/exynos/exynos_drm_rotator.c
index 55af6b41c1dfa3f0da4be362245212838371ff1a..425e7062538812c0613c055b9b4fdeea709c4be0 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_rotator.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_rotator.c
@@ -156,8 +156,7 @@ static irqreturn_t rotator_irq_handler(int irq, void *arg)
                event_work->ippdrv = ippdrv;
                event_work->buf_id[EXYNOS_DRM_OPS_DST] =
                        rot->cur_buf_id[EXYNOS_DRM_OPS_DST];
-               queue_work(ippdrv->event_workq,
-                       (struct work_struct *)event_work);
+               queue_work(ippdrv->event_workq, &event_work->work);
        } else {
                DRM_ERROR("the SFR is set illegally\n");
        }
@@ -823,7 +822,7 @@ static int rotator_resume(struct device *dev)
 }
 #endif
 
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
 static int rotator_runtime_suspend(struct device *dev)
 {
        struct rot_context *rot = dev_get_drvdata(dev);