diff options
| author | Koji Matsuoka <koji.matsuoka.xm@renesas.com> | 2015-03-29 10:04:56 -0300 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2015-05-11 15:07:51 +0900 |
| commit | 4ca8d85bcd70542fa4726bc673425dc743044077 (patch) | |
| tree | 61bd519b704ca45d0c56d186b94cd0a1b8941b96 | |
| parent | 19a5a273695862d2dc51a0213ef7a21a35613436 (diff) | |
| download | renesas-backport-backport/v4.0/rcar-vin.tar.gz | |
[media] media: soc_camera: rcar_vin: Fix wait_for_completionbackport/v4.0/rcar-vin-to-v4.1-rc3backport/v4.0/rcar-vin
When stopping abnormally, a driver can't return from wait_for_completion.
This patch resolved this problem by changing wait_for_completion_timeout
from wait_for_completion.
Signed-off-by: Koji Matsuoka <koji.matsuoka.xm@renesas.com>
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
(cherry picked from commit 5a9b06a27db6b006605421658418fb8943a6e217)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
| -rw-r--r-- | drivers/media/platform/soc_camera/rcar_vin.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c index 9351f64dee7b4f..6460f8e1b07fc6 100644 --- a/drivers/media/platform/soc_camera/rcar_vin.c +++ b/drivers/media/platform/soc_camera/rcar_vin.c @@ -135,6 +135,8 @@ #define VIN_MAX_WIDTH 2048 #define VIN_MAX_HEIGHT 2048 +#define TIMEOUT_MS 100 + enum chip_id { RCAR_GEN2, RCAR_H1, @@ -820,7 +822,10 @@ static void rcar_vin_wait_stop_streaming(struct rcar_vin_priv *priv) if (priv->state == STOPPING) { priv->request_to_stop = true; spin_unlock_irq(&priv->lock); - wait_for_completion(&priv->capture_stop); + if (!wait_for_completion_timeout( + &priv->capture_stop, + msecs_to_jiffies(TIMEOUT_MS))) + priv->state = STOPPED; spin_lock_irq(&priv->lock); } } |