[PATCH 10/15] drm/exynos/ipp: stop hardware before freeing memory

[Andrzej Hajda]

Memory shouldn't be freed when hardware is still running.

Signed-off-by: Andrzej Hajda <a.hajda at samsung.com>
---
 drivers/gpu/drm/exynos/exynos_drm_ipp.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/exynos/exynos_drm_ipp.c 
b/drivers/gpu/drm/exynos/exynos_drm_ipp.c
index c72d8d1..6de75aa 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_ipp.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_ipp.c
@@ -1283,12 +1283,15 @@ static int ipp_stop_property(struct drm_device *drm_dev,
                struct drm_exynos_ipp_cmd_node *c_node)
 {
        struct drm_exynos_ipp_property *property = &c_node->property;
-       int ret = 0, i;
+       int i;

        DRM_DEBUG_KMS("prop_id[%d]\n", property->prop_id);

        /* put event */
        ipp_put_event(c_node, NULL);
+       /* stop operations */
+       if (ippdrv->stop)
+               ippdrv->stop(ippdrv->dev, property->cmd);

        /* check command */
        switch (property->cmd) {
@@ -1304,16 +1307,10 @@ static int ipp_stop_property(struct drm_device *drm_dev,
                break;
        default:
                DRM_ERROR("invalid operations.\n");
-               ret = -EINVAL;
-               goto err_clear;
+               return -EINVAL;
        }

-err_clear:
-       /* stop operations */
-       if (ippdrv->stop)
-               ippdrv->stop(ippdrv->dev, property->cmd);
-
-       return ret;
+       return 0;
 }

 void ipp_sched_cmd(struct work_struct *work)
-- 
1.9.1