diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2013-10-09 18:52:45 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2013-12-11 13:02:54 +0400 |
| commit | 6016498f2b9d72b4f813d7349f0621ccc92c4f5a (patch) | |
| tree | d476c9621a729ba9f8ef52cf37a650aff2fb5bd3 /drivers/staging/media/omap4iss/iss_ipipe.c | |
| parent | 0b1d4249660fbb0c558a096ce72914b7f5fa82a8 (diff) | |
| download | linux-6016498f2b9d72b4f813d7349f0621ccc92c4f5a.tar.xz | |
[media] v4l: omap4iss: Propagate stop timeouts from submodules to the driver core
Return an error from the s_stream handlers when stopping the stream
failed instead of just logging the error and ignoring it. While we're
at it, move the logging code from submodules to the driver code.
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, 1 insertions, 2 deletions
diff --git a/drivers/staging/media/omap4iss/iss_ipipe.c b/drivers/staging/media/omap4iss/iss_ipipe.c index d0b9f8c512fc..c013f839146a 100644 --- a/drivers/staging/media/omap4iss/iss_ipipe.c +++ b/drivers/staging/media/omap4iss/iss_ipipe.c @@ -166,8 +166,7 @@ static int ipipe_set_stream(struct v4l2_subdev *sd, int enable) return 0; if (omap4iss_module_sync_idle(&sd->entity, &ipipe->wait, &ipipe->stopping)) - dev_dbg(iss->dev, "%s: module stop timeout.\n", - sd->name); + ret = -ETIMEDOUT; ipipe_enable(ipipe, 0); omap4iss_isp_disable_interrupts(iss); |