diff for duplicates of <20130625105123.GN23141@intel.com> diff --git a/a/1.txt b/N1/1.txt index bbb31db..d03699d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -297,14 +297,14 @@ Though checkpatch cribbed about space and tabs, fixed up manually... > + return NULL; > > - for (i = 0, cfg = pdata->slave; i < pdata->slave_num; i++, cfg++) -> - if (cfg->slave_id = slave_id) +> - if (cfg->slave_id == slave_id) > - return cfg; > + for (i = 0, cfg = pdata->slave; i < pdata->slave_num; i++, cfg++) -> + 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) { > + sh_chan->shdma_chan.slave_id = cfg->slave_id; > + return cfg; > + } diff --git a/a/content_digest b/N1/content_digest index e37fd68..f7db3d1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0Pine.LNX.4.64.1306181813380.30844@axis700.grange\0" "From\0Vinod Koul <vinod.koul@intel.com>\0" "Subject\0Re: [PATCH v3] DMA: shdma: add DT support\0" - "Date\0Tue, 25 Jun 2013 11:03:23 +0000\0" + "Date\0Tue, 25 Jun 2013 16:21:23 +0530\0" "To\0Guennadi Liakhovetski <g.liakhovetski@gmx.de>\0" "Cc\0linux-sh@vger.kernel.org" Arnd Bergmann <arnd@arndb.de> @@ -310,14 +310,14 @@ "> +\t\t\treturn NULL;\n" "> \n" "> -\tfor (i = 0, cfg = pdata->slave; i < pdata->slave_num; i++, cfg++)\n" - "> -\t\tif (cfg->slave_id = slave_id)\n" + "> -\t\tif (cfg->slave_id == slave_id)\n" "> -\t\t\treturn cfg;\n" "> +\t\tfor (i = 0, cfg = pdata->slave; i < pdata->slave_num; i++, cfg++)\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\t\t\tsh_chan->shdma_chan.slave_id = cfg->slave_id;\n" "> +\t\t\t\treturn cfg;\n" "> +\t\t\t}\n" @@ -363,4 +363,4 @@ "\n" -- -ca7b3a45de0a706d66cab73dcad73f9f674d4b62c6e6e82136329c5112b2b4f1 +3747f110885df1658628f2c46af623a5467539430501e2ff74b329d8249996de
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.