Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e34a89b3 authored by Shaik Ameer Basha's avatar Shaik Ameer Basha Committed by Mauro Carvalho Chehab
Browse files

[media] s5p-fimc: send valid m2m ctx to fimc_m2m_job_finish 



fimc_m2m_job_finish() has to be called with the m2m context for the necessary
cleanup while resume. But currently fimc_m2m_job_finish() always passes m2m
context as NULL.
This patch preserves the context before making it null, for necessary cleanup.

Signed-off-by: default avatarShaik Ameer Basha <shaik.ameer@samsung.com>
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 5d83790b

drivers/media/platform/s5p-fimc/fimc-core.c

+4 −2
Original line number Diff line number Diff line
@@ -850,16 +850,18 @@ static int fimc_m2m_suspend(struct fimc_dev *fimc) 


static int fimc_m2m_resume(struct fimc_dev *fimc)

{

	struct fimc_ctx *ctx;

	unsigned long flags;



	spin_lock_irqsave(&fimc->slock, flags);

	/* Clear for full H/W setup in first run after resume */

	ctx = fimc->m2m.ctx;

	fimc->m2m.ctx = NULL;

	spin_unlock_irqrestore(&fimc->slock, flags);



	if (test_and_clear_bit(ST_M2M_SUSPENDED, &fimc->state))

		fimc_m2m_job_finish(fimc->m2m.ctx,

				    VB2_BUF_STATE_ERROR);

		fimc_m2m_job_finish(ctx, VB2_BUF_STATE_ERROR);



	return 0;

}