diff for duplicates of <53E8B3AA.2000509@xs4all.nl> diff --git a/a/1.txt b/N1/1.txt index 7369cd4..ecadf23 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,11 +12,11 @@ On 08/11/2014 01:23 PM, 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); @@ -43,11 +43,11 @@ On 08/11/2014 01:23 PM, 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); @@ -124,7 +124,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 d51504e..e0b23c0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,7 +4,7 @@ "ref\020140811122343.858030a5082cfe1723acec4c@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, 11 Aug 2014 12:14:34 +0000\0" + "Date\0Mon, 11 Aug 2014 14:14:34 +0200\0" "To\0Ian Molton <ian.molton@codethink.co.uk>\0" "Cc\0linux-media@vger.kernel.org" linux-kernel@lists.codethink.co.uk @@ -30,11 +30,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" @@ -61,11 +61,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" @@ -142,7 +142,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" @@ -158,4 +158,4 @@ "> \n" > -63a473932f700f7459464c1058430dec13a61ad8d4e60357ff4df67be1ad4a8d +4440a5a60b45a6257f761c39989245d7f6c2cbcc64e3e939d0eb4356ec00169b
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.