diff options
| author | Katsuya Matsubara <matsu@igel.co.jp> | 2013-04-23 14:51:35 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-06-09 04:50:13 +0400 |
| commit | 9166e1aae3c90720fc389815909cb0bb815d9bca (patch) | |
| tree | 802e132735a600fa0a75c3f5d4714ed200d47ec4 /drivers/media/platform/sh_veu.c | |
| parent | 560dde24adfdc9dbcd141c75faecc5e0402fe531 (diff) | |
| download | linux-9166e1aae3c90720fc389815909cb0bb815d9bca.tar.xz | |
[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>
Diffstat (limited to 'drivers/media/platform/sh_veu.c')
| -rw-r--r-- | drivers/media/platform/sh_veu.c | 5 |
1 files changed, 1 insertions, 4 deletions
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) |