diff for duplicates of <534D2420.5060308@cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index d4054df..64f8ef8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,11 +14,11 @@ On 15-04-2014 1:35, Ben Dooks wrote: > --- a/drivers/dma/sh/shdmac.c > +++ b/drivers/dma/sh/shdmac.c > @@ -342,11 +342,21 @@ static const struct sh_dmae_slave_config *dmae_find_slave( -> if (cfg->slave_id = match) +> if (cfg->slave_id == match) > return cfg; > } else { > - for (i = 0, cfg = pdata->slave; i < pdata->slave_num; i++, cfg++) -> - if (cfg->mid_rid = match) { +> - if (cfg->mid_rid == match) { > + if (!pdata->slave) { > + cfg = shdma_find_slave_of(shdev, match, &i); > + if (cfg) { @@ -33,7 +33,7 @@ On 15-04-2014 1:35, Ben Dooks wrote: > + for (i = 0, cfg = pdata->slave; i < pdata->slave_num; > + i++, cfg++) -> + if (cfg->mid_rid = match) { +> + if (cfg->mid_rid == match) { > + sh_chan->shdma_chan.slave_id = i; > + return cfg; > + } diff --git a/a/content_digest b/N1/content_digest index db438ec..4a87d9f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01397511312-4845-10-git-send-email-ben.dooks@codethink.co.uk\0" "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Subject\0Re: [PATCH v2 9/9] DMA: shdma: wire r8a7790\0" - "Date\0Tue, 15 Apr 2014 12:20:48 +0000\0" + "Date\0Tue, 15 Apr 2014 16:20:48 +0400\0" "To\0Ben Dooks <ben.dooks@codethink.co.uk>" linux-kernel@lists.codethink.co.uk " dmaengine@vger.kernel.org\0" @@ -32,11 +32,11 @@ "> --- a/drivers/dma/sh/shdmac.c\n" "> +++ b/drivers/dma/sh/shdmac.c\n" "> @@ -342,11 +342,21 @@ static const struct sh_dmae_slave_config *dmae_find_slave(\n" - "> \t\t\tif (cfg->slave_id = match)\n" + "> \t\t\tif (cfg->slave_id == match)\n" "> \t\t\t\treturn cfg;\n" "> \t} else {\n" "> -\t\tfor (i = 0, cfg = pdata->slave; i < pdata->slave_num; i++, cfg++)\n" - "> -\t\t\tif (cfg->mid_rid = match) {\n" + "> -\t\t\tif (cfg->mid_rid == match) {\n" "> +\t\tif (!pdata->slave) {\n" "> +\t\t\tcfg = shdma_find_slave_of(shdev, match, &i);\n" "> +\t\t\tif (cfg) {\n" @@ -51,7 +51,7 @@ "\n" "> +\t\t\tfor (i = 0, cfg = pdata->slave; i < pdata->slave_num;\n" "> +\t\t\t i++, cfg++)\n" - "> +\t\t\t\tif (cfg->mid_rid = match) {\n" + "> +\t\t\t\tif (cfg->mid_rid == match) {\n" "> +\t\t\t\t\tsh_chan->shdma_chan.slave_id = i;\n" "> +\t\t\t\t\treturn cfg;\n" "> +\t\t\t\t}\n" @@ -61,4 +61,4 @@ "\n" WBR, Sergei -42bc8d6065add6c47a77a2b336b221b1d59789c9ff55c04892bc4b6cacf835d7 +d40566375f06473e418c62f2beada31ba3508b8dbc26dc6f83a051382fac53c8
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.