diff for duplicates of <51C4B2CD.2030302@cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index adf67ca..2177079 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -30,7 +30,8 @@ On 06/13/2013 05:12 PM, Guennadi Liakhovetski wrote: > [snip] >> Index: media_tree/drivers/media/platform/soc_camera/rcar_vin.c ->> =================================>> --- /dev/null +>> =================================================================== +>> --- /dev/null >> +++ media_tree/drivers/media/platform/soc_camera/rcar_vin.c [...] >> +static irqreturn_t rcar_vin_irq(int irq, void *data) @@ -40,7 +41,7 @@ On 06/13/2013 05:12 PM, Guennadi Liakhovetski wrote: >> + priv->state = STOPPED; >> + } else if (is_continuous_transfer(priv) && >> + list_empty(&priv->capture) && ->> + priv->state = RUNNING) { +>> + priv->state == RUNNING) { >> + /* >> + * The continuous capturing requires an explicit stop >> + * operation when there is no buffer to be set into diff --git a/a/content_digest b/N1/content_digest index 2cb1e8b..5753635 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\0Pine.LNX.4.64.1306131245420.31976@axis700.grange\0" "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Subject\0Re: [PATCH v6] V4L2: soc_camera: Renesas R-Car VIN driver\0" - "Date\0Fri, 21 Jun 2013 20:08:45 +0000\0" + "Date\0Sat, 22 Jun 2013 00:08:45 +0400\0" "To\0Guennadi Liakhovetski <g.liakhovetski@gmx.de>\0" "Cc\0mchehab@redhat.com" linux-media@vger.kernel.org @@ -45,7 +45,8 @@ "> [snip]\n" "\n" ">> Index: media_tree/drivers/media/platform/soc_camera/rcar_vin.c\n" - ">> =================================>> --- /dev/null\n" + ">> ===================================================================\n" + ">> --- /dev/null\n" ">> +++ media_tree/drivers/media/platform/soc_camera/rcar_vin.c\n" "[...]\n" ">> +static irqreturn_t rcar_vin_irq(int irq, void *data)\n" @@ -55,7 +56,7 @@ ">> +\t\t\tpriv->state = STOPPED;\n" ">> +\t\t} else if (is_continuous_transfer(priv) &&\n" ">> +\t\t\t list_empty(&priv->capture) &&\n" - ">> +\t\t\t priv->state = RUNNING) {\n" + ">> +\t\t\t priv->state == RUNNING) {\n" ">> +\t\t\t/*\n" ">> +\t\t\t * The continuous capturing requires an explicit stop\n" ">> +\t\t\t * operation when there is no buffer to be set into\n" @@ -76,4 +77,4 @@ "\n" WBR, Sergei -624587cc23b6fdb95ee33908c477d893720ca87aa3009f96d9954d51e6e2f85e +20cc24e4a25027d966cf30514d51ab74c0e982b70ad82845aff42602450bf00e
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.