diff for duplicates of <53DFFABC.9000800@xs4all.nl> diff --git a/a/1.txt b/N1/1.txt index 20d9026..b65e5ed 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -31,11 +31,11 @@ On 07/08/2014 11:41 AM, Ian Molton wrote: > + while (priv->state != STOPPED) { > + > + /* issue stop if running */ -> + if (priv->state = RUNNING) +> + if (priv->state == RUNNING) > + rcar_vin_request_capture_stop(priv); > + > + /* wait until capturing has been stopped */ -> + if (priv->state = STOPPING) { +> + if (priv->state == STOPPING) { > + priv->request_to_stop = true; > + spin_unlock_irq(&priv->lock); > + wait_for_completion(&priv->capture_stop); @@ -62,11 +62,11 @@ On 07/08/2014 11:41 AM, Ian Molton wrote: > - while (priv->state != STOPPED) { > - > - /* issue stop if running */ -> - if (priv->state = RUNNING) +> - if (priv->state == RUNNING) > - rcar_vin_request_capture_stop(priv); > - > - /* wait until capturing has been stopped */ -> - if (priv->state = STOPPING) { +> - if (priv->state == STOPPING) { > - priv->request_to_stop = true; > - spin_unlock_irq(&priv->lock); > - wait_for_completion(&priv->capture_stop); @@ -102,7 +102,7 @@ Regards, > + rcar_vin_wait_stop_streaming(priv); > + > for (i = 0; i < vq->num_buffers; ++i) -> if (vq->bufs[i]->state = VB2_BUF_STATE_ACTIVE) +> if (vq->bufs[i]->state == VB2_BUF_STATE_ACTIVE) > vb2_buffer_done(vq->bufs[i], VB2_BUF_STATE_ERROR); > > list_for_each_safe(buf_head, tmp, &priv->capture) diff --git a/a/content_digest b/N1/content_digest index 4840d7d..a41e9c6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01404812474-7627-4-git-send-email-ian.molton@codethink.co.uk\0" "From\0Hans Verkuil <hverkuil@xs4all.nl>\0" "Subject\0Re: [PATCH 3/4] media: rcar_vin: Fix race condition terminating stream\0" - "Date\0Mon, 04 Aug 2014 21:27:24 +0000\0" + "Date\0Mon, 04 Aug 2014 23:27:24 +0200\0" "To\0Ian Molton <ian.molton@codethink.co.uk>" " linux-media@vger.kernel.org\0" "Cc\0linux-kernel@lists.codethink.co.uk" @@ -47,11 +47,11 @@ "> +\twhile (priv->state != STOPPED) {\n" "> +\n" "> +\t\t/* issue stop if running */\n" - "> +\t\tif (priv->state = RUNNING)\n" + "> +\t\tif (priv->state == RUNNING)\n" "> +\t\t\trcar_vin_request_capture_stop(priv);\n" "> +\n" "> +\t\t/* wait until capturing has been stopped */\n" - "> +\t\tif (priv->state = STOPPING) {\n" + "> +\t\tif (priv->state == STOPPING) {\n" "> +\t\t\tpriv->request_to_stop = true;\n" "> +\t\t\tspin_unlock_irq(&priv->lock);\n" "> +\t\t\twait_for_completion(&priv->capture_stop);\n" @@ -78,11 +78,11 @@ "> -\t\twhile (priv->state != STOPPED) {\n" "> -\n" "> -\t\t\t/* issue stop if running */\n" - "> -\t\t\tif (priv->state = RUNNING)\n" + "> -\t\t\tif (priv->state == RUNNING)\n" "> -\t\t\t\trcar_vin_request_capture_stop(priv);\n" "> -\n" "> -\t\t\t/* wait until capturing has been stopped */\n" - "> -\t\t\tif (priv->state = STOPPING) {\n" + "> -\t\t\tif (priv->state == STOPPING) {\n" "> -\t\t\t\tpriv->request_to_stop = true;\n" "> -\t\t\t\tspin_unlock_irq(&priv->lock);\n" "> -\t\t\t\twait_for_completion(&priv->capture_stop);\n" @@ -118,7 +118,7 @@ "> +\trcar_vin_wait_stop_streaming(priv);\n" "> +\n" "> \tfor (i = 0; i < vq->num_buffers; ++i)\n" - "> \t\tif (vq->bufs[i]->state = VB2_BUF_STATE_ACTIVE)\n" + "> \t\tif (vq->bufs[i]->state == VB2_BUF_STATE_ACTIVE)\n" "> \t\t\tvb2_buffer_done(vq->bufs[i], VB2_BUF_STATE_ERROR);\n" "> \n" "> \tlist_for_each_safe(buf_head, tmp, &priv->capture)\n" @@ -129,4 +129,4 @@ "> \n" > -c709c89bcc34f5bee612c4f8411ee2022fbd4d12abd92615d5ea5f4d217086d6 +5f6491bfe72558c794f32b70bf637301cf830c65fec33854ff45469b3d52d836
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.