diff for duplicates of <1350641736-18192-3-git-send-email-hechtb@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 29fa693..10108d0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -143,7 +143,7 @@ index 78d18c0f..6dc0369 100644 + uint32_t reg; + int ret; + -+ if (dir == DMA_FROM_DEVICE) { ++ if (dir = DMA_FROM_DEVICE) { + chan = flctl->chan_fifo0_rx; + tr_dir = DMA_DEV_TO_MEM; + } else { @@ -176,8 +176,7 @@ index 78d18c0f..6dc0369 100644 + goto out; + } + -+ ret = -+ wait_for_completion_timeout(&flctl->dma_complete, ++ ret + wait_for_completion_timeout(&flctl->dma_complete, + msecs_to_jiffies(3000)); + + if (ret <= 0) { diff --git a/a/content_digest b/N1/content_digest index 5e13cd4..5920ea7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,8 @@ "ref\01350641736-18192-1-git-send-email-hechtb@gmail.com\0" "From\0Bastian Hecht <hechtb@googlemail.com>\0" "Subject\0[PATCH v3 2/3] mtd: sh_flctl: Add DMA capabilty\0" - "Date\0Fri, 19 Oct 2012 12:15:35 +0200\0" - "To\0linux-mtd@lists.infradead.org\0" - "Cc\0linux-sh@vger.kernel.org" - Vikram Narayanan <vikram186@gmail.com> - Artem Bityutskiy <dedekind1@gmail.com> - Magnus Damm <magnus.damm@gmail.com> - Guennadi Liakhovetski <g.liakhovetski@gmx.de> - " linux-arm-kernel@lists.infradead.org\0" + "Date\0Fri, 19 Oct 2012 10:15:35 +0000\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "The code probes if DMA channels can get allocated and tears them down at\n" @@ -156,7 +150,7 @@ "+\tuint32_t reg;\n" "+\tint ret;\n" "+\n" - "+\tif (dir == DMA_FROM_DEVICE) {\n" + "+\tif (dir = DMA_FROM_DEVICE) {\n" "+\t\tchan = flctl->chan_fifo0_rx;\n" "+\t\ttr_dir = DMA_DEV_TO_MEM;\n" "+\t} else {\n" @@ -189,8 +183,7 @@ "+\t\tgoto out;\n" "+\t}\n" "+\n" - "+\tret =\n" - "+\twait_for_completion_timeout(&flctl->dma_complete,\n" + "+\tret +\twait_for_completion_timeout(&flctl->dma_complete,\n" "+\t\t\t\tmsecs_to_jiffies(3000));\n" "+\n" "+\tif (ret <= 0) {\n" @@ -334,4 +327,4 @@ "-- \n" 1.7.9.5 -66918475bc2eac7e9890a18fc96bd9f9a195f11e276dea3324fada2d791e07ea +abf6282c26a7e90eaf58782a8088389b4733f7c1bc749f42c3309859104f9c37
diff --git a/a/1.txt b/N2/1.txt index 29fa693..97f6860 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -80,7 +80,7 @@ index 78d18c0f..6dc0369 100644 + if (pdata->slave_id_fifo0_tx <= 0 || pdata->slave_id_fifo0_rx <= 0) + return; + -+ /* We can only either use DMA for both Tx and Rx or not use it at all */ ++ /* We can only either use DMA for both Tx and Rx or not use it@all */ + dma_cap_zero(mask); + dma_cap_set(DMA_SLAVE, mask); + diff --git a/a/content_digest b/N2/content_digest index 5e13cd4..235e503 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,14 +1,8 @@ "ref\01350641736-18192-1-git-send-email-hechtb@gmail.com\0" - "From\0Bastian Hecht <hechtb@googlemail.com>\0" + "From\0hechtb@googlemail.com (Bastian Hecht)\0" "Subject\0[PATCH v3 2/3] mtd: sh_flctl: Add DMA capabilty\0" "Date\0Fri, 19 Oct 2012 12:15:35 +0200\0" - "To\0linux-mtd@lists.infradead.org\0" - "Cc\0linux-sh@vger.kernel.org" - Vikram Narayanan <vikram186@gmail.com> - Artem Bityutskiy <dedekind1@gmail.com> - Magnus Damm <magnus.damm@gmail.com> - Guennadi Liakhovetski <g.liakhovetski@gmx.de> - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "The code probes if DMA channels can get allocated and tears them down at\n" @@ -93,7 +87,7 @@ "+\tif (pdata->slave_id_fifo0_tx <= 0 || pdata->slave_id_fifo0_rx <= 0)\n" "+\t\treturn;\n" "+\n" - "+\t/* We can only either use DMA for both Tx and Rx or not use it at all */\n" + "+\t/* We can only either use DMA for both Tx and Rx or not use it@all */\n" "+\tdma_cap_zero(mask);\n" "+\tdma_cap_set(DMA_SLAVE, mask);\n" "+\n" @@ -334,4 +328,4 @@ "-- \n" 1.7.9.5 -66918475bc2eac7e9890a18fc96bd9f9a195f11e276dea3324fada2d791e07ea +7a9f6bc190b82b2209bd4bc6e44d773ef3a9866ac1efd00b0e90ee3a25f6c033
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.