diff for duplicates of <1348401683-15698-2-git-send-email-hechtb@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 8902144..1b1a354 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -51,7 +51,7 @@ index 2cf6871..00211f9 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 { @@ -85,8 +85,7 @@ index 2cf6871..00211f9 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 50d44e6..dc8d7d7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01348401683-15698-1-git-send-email-hechtb@gmail.com\0" "From\0Bastian Hecht <hechtb@googlemail.com>\0" "Subject\0[PATCH 2/2] mtd: sh_flctl: Use DMA for data fifo FLTDFIFO when available\0" - "Date\0Sun, 23 Sep 2012 14:01:23 +0200\0" + "Date\0Sun, 23 Sep 2012 12:01:23 +0000\0" "To\0linux-mtd@lists.infradead.org\0" "Cc\0Magnus Damm <magnus.damm@gmail.com>" Guennadi Liakhovetski <g.liakhovetski@gmx.de> @@ -61,7 +61,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" @@ -95,8 +95,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" @@ -175,4 +174,4 @@ "-- \n" 1.7.5.4 -10f33ced48c6ba27e3861d689248a2d776d50cfc7fd1f4c3c379be3b869ff0f3 +1cc881973d96f38d257b34e44f68e5f7fb68211e580132f8da649f2a708dc8fb
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.