From: Katsuya Matsubara <matsu@igel.co.jp> Date: Tue, 23 Apr 2013 10:51:35 +0000 (-0300) Subject: [media] sh_veu: invoke v4l2_m2m_job_finish() even if a job has been aborted X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9166e1aae3c90720fc389815909cb0bb815d9bca;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git [media] sh_veu: invoke v4l2_m2m_job_finish() even if a job has been aborted v4l2_m2m_job_finish() should be invoked even if the current ongoing job has been aborted since v4l2_m2m_ctx_release() which has issued the job abort may wait until the finish function is invoked. Signed-off-by: Katsuya Matsubara <matsu@igel.co.jp> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> --- diff --git a/drivers/media/platform/sh_veu.c b/drivers/media/platform/sh_veu.c index 0b32cc3f6a47..6fecf9f4a8dc 100644 --- a/drivers/media/platform/sh_veu.c +++ b/drivers/media/platform/sh_veu.c @@ -1138,10 +1138,7 @@ static irqreturn_t sh_veu_isr(int irq, void *dev_id) veu->xaction++; - if (!veu->aborting) - return IRQ_WAKE_THREAD; - - return IRQ_HANDLED; + return IRQ_WAKE_THREAD; } static int sh_veu_probe(struct platform_device *pdev)