diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2013-10-10 17:40:02 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2013-12-11 13:03:33 +0400 |
| commit | af15d025ecdf35ad1eb438595727d80155d8d28e (patch) | |
| tree | e65acd059e949ea7c60890546d1cd449909b424b /drivers/staging/media/omap4iss/iss_ipipe.c | |
| parent | 6016498f2b9d72b4f813d7349f0621ccc92c4f5a (diff) | |
| download | linux-af15d025ecdf35ad1eb438595727d80155d8d28e.tar.xz | |
[media] v4l: omap4iss: Enable/disabling the ISP interrupts globally
ISP interrupts are enabled/disabled when starting/stopping the IPIPEIF
or resizer. This doesn't permit using the two modules in separate
pipelines. Fix it by enabling/disabling the ISP interrupts at the same
time as the ISS interrupts, in the ISS device get/put operations.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/staging/media/omap4iss/iss_ipipe.c')
| -rw-r--r-- | drivers/staging/media/omap4iss/iss_ipipe.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/staging/media/omap4iss/iss_ipipe.c b/drivers/staging/media/omap4iss/iss_ipipe.c index c013f839146a..6eaafc5e2eea 100644 --- a/drivers/staging/media/omap4iss/iss_ipipe.c +++ b/drivers/staging/media/omap4iss/iss_ipipe.c @@ -116,8 +116,6 @@ static void ipipe_configure(struct iss_ipipe_device *ipipe) /* IPIPE_PAD_SOURCE_VP */ format = &ipipe->formats[IPIPE_PAD_SOURCE_VP]; /* Do nothing? */ - - omap4iss_isp_enable_interrupts(iss); } /* ----------------------------------------------------------------------------- @@ -169,7 +167,6 @@ static int ipipe_set_stream(struct v4l2_subdev *sd, int enable) ret = -ETIMEDOUT; ipipe_enable(ipipe, 0); - omap4iss_isp_disable_interrupts(iss); omap4iss_isp_subclk_disable(iss, OMAP4_ISS_ISP_SUBCLK_IPIPE); break; } |