[media] coda: make seq_end_work optional

[deliverable/linux.git] / drivers / media / platform / coda / coda-common.c

diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index f881e87e55d3ade0cca832f679b2e2a7b7027ca2..35a42c56dd603bedb0a4f1eb22e8636b45f726a7 100644 (file)
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -921,7 +921,8 @@ static void coda_pic_run_work(struct work_struct *work)
                ctx->ops->finish_run(ctx);
        }
 
-       if (ctx->aborting || (!ctx->streamon_cap && !ctx->streamon_out))
+       if ((ctx->aborting || (!ctx->streamon_cap && !ctx->streamon_out)) &&
+           ctx->ops->seq_end_work)
                queue_work(dev->workqueue, &ctx->seq_end_work);
 
        mutex_unlock(&dev->coda_mutex);
@@ -1627,7 +1628,8 @@ static int coda_open(struct file *file)
        ctx->ops = ctx->cvd->ops;
        init_completion(&ctx->completion);
        INIT_WORK(&ctx->pic_run_work, coda_pic_run_work);
-       INIT_WORK(&ctx->seq_end_work, ctx->ops->seq_end_work);
+       if (ctx->ops->seq_end_work)
+               INIT_WORK(&ctx->seq_end_work, ctx->ops->seq_end_work);
        v4l2_fh_init(&ctx->fh, video_devdata(file));
        file->private_data = &ctx->fh;
        v4l2_fh_add(&ctx->fh);
@@ -1748,7 +1750,7 @@ static int coda_release(struct file *file)
        v4l2_m2m_ctx_release(ctx->fh.m2m_ctx);
 
        /* In case the instance was not running, we still need to call SEQ_END */
-       if (ctx->initialized) {
+       if (ctx->initialized && ctx->ops->seq_end_work) {
                queue_work(dev->workqueue, &ctx->seq_end_work);
                flush_work(&ctx->seq_end_work);
        }