[media] sh_veu: invoke v4l2_m2m_job_finish() even if a job has been aborted

Katsuya Matsubara · Mauro Carvalho Chehab · commit 9166e1aae3c9 · 2013-06-08T21:50:13.000-03:00
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 &lt;matsu@igel.co.jp&gt;
Signed-off-by: Guennadi Liakhovetski &lt;g.liakhovetski@gmx.de&gt;
Signed-off-by: Mauro Carvalho Chehab &lt;mchehab@redhat.com&gt;
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -1138,10 +1138,7 @@ static irqreturn_t sh_veu_isr(int irq, void *dev_id)`
`1138`	`1138`
`1139`	`1139`	`veu->xaction++;`
`1140`	`1140`
`1141`		`- if (!veu->aborting)`
`1142`		`- return IRQ_WAKE_THREAD;`
`1143`		`-`
`1144`		`- return IRQ_HANDLED;`
	`1141`	`+ return IRQ_WAKE_THREAD;`
`1145`	`1142`	`}`
`1146`	`1143`
`1147`	`1144`	`static int sh_veu_probe(struct platform_device *pdev)`