2 files changed, 17 insertions, 13 deletions

diff --git a/drivers/media/platform/exynos-gsc/gsc-core.h b/drivers/media/platform/exynos-gsc/gsc-core.h
index 76435d3bf62d..ef0a6564cef9 100644
--- a/drivers/media/platform/exynos-gsc/gsc-core.h
+++ b/drivers/media/platform/exynos-gsc/gsc-core.h
@@ -45,6 +45,7 @@
 #define GSC_DST_FMT                     (1 << 2)
 #define GSC_CTX_M2M                     (1 << 3)
 #define GSC_CTX_STOP_REQ                (1 << 6)
+#define GSC_CTX_ABORT                   (1 << 7)
 
 enum gsc_dev_flags {
         /* for global */
diff --git a/drivers/media/platform/exynos-gsc/gsc-m2m.c b/drivers/media/platform/exynos-gsc/gsc-m2m.c
index e576ff2de3de..810c3e13970c 100644
--- a/drivers/media/platform/exynos-gsc/gsc-m2m.c
+++ b/drivers/media/platform/exynos-gsc/gsc-m2m.c
@@ -46,6 +46,17 @@ static int gsc_m2m_ctx_stop_req(struct gsc_ctx *ctx)
         return ret == 0 ? -ETIMEDOUT : ret;
 }
 
+static void __gsc_m2m_job_abort(struct gsc_ctx *ctx)
+{
+        int ret;
+
+        ret = gsc_m2m_ctx_stop_req(ctx);
+        if ((ret == -ETIMEDOUT) || (ctx->state & GSC_CTX_ABORT)) {
+                gsc_ctx_state_lock_clear(GSC_CTX_STOP_REQ | GSC_CTX_ABORT, ctx);
+                gsc_m2m_job_finish(ctx, VB2_BUF_STATE_ERROR);
+        }
+}
+
 static int gsc_m2m_start_streaming(struct vb2_queue *q, unsigned int count)
 {
         struct gsc_ctx *ctx = q->drv_priv;
@@ -58,11 +69,8 @@ static int gsc_m2m_start_streaming(struct vb2_queue *q, unsigned int count)
 static int gsc_m2m_stop_streaming(struct vb2_queue *q)
 {
         struct gsc_ctx *ctx = q->drv_priv;
-        int ret;
 
-        ret = gsc_m2m_ctx_stop_req(ctx);
-        if (ret == -ETIMEDOUT)
-                gsc_m2m_job_finish(ctx, VB2_BUF_STATE_ERROR);
+        __gsc_m2m_job_abort(ctx);
 
         pm_runtime_put(&ctx->gsc_dev->pdev->dev);
 
@@ -91,15 +99,9 @@ void gsc_m2m_job_finish(struct gsc_ctx *ctx, int vb_state)
         }
 }
 
-
 static void gsc_m2m_job_abort(void *priv)
 {
-        struct gsc_ctx *ctx = priv;
-        int ret;
-
-        ret = gsc_m2m_ctx_stop_req(ctx);
-        if (ret == -ETIMEDOUT)
-                gsc_m2m_job_finish(ctx, VB2_BUF_STATE_ERROR);
+        __gsc_m2m_job_abort((struct gsc_ctx *)priv);
 }
 
 static int gsc_get_bufs(struct gsc_ctx *ctx)
@@ -150,9 +152,10 @@ static void gsc_m2m_device_run(void *priv)
                 gsc->m2m.ctx = ctx;
         }
 
-        is_set = (ctx->state & GSC_CTX_STOP_REQ) ? 1 : 0;
-        ctx->state &= ~GSC_CTX_STOP_REQ;
+        is_set = ctx->state & GSC_CTX_STOP_REQ;
         if (is_set) {
+                ctx->state &= ~GSC_CTX_STOP_REQ;
+                ctx->state |= GSC_CTX_ABORT;
                 wake_up(&gsc->irq_queue);
                 goto put_device;
         }