All of lore.kernel.org
 help / color / mirror / Atom feed

diff for duplicates of <CANfBPZ-azGV0H7asRHD5+vdFjCkrx=E2Oypnrk_SW9K5+DwTLQ@mail.gmail.com>

diff --git a/a/1.txt b/N1/1.txt
index ae23ae6..789e4bd 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -18,34 +18,34 @@ On Mon, Aug 29, 2011 at 3:38 AM, Per Forlin <per.forlin@linaro.org> wrote:
 > ---
 > Bug fix on 3.1-rc3
 >
->  drivers/mmc/host/omap_hsmmc.c |    7 +++++--
->  1 files changed, 5 insertions(+), 2 deletions(-)
+> ?drivers/mmc/host/omap_hsmmc.c | ? ?7 +++++--
+> ?1 files changed, 5 insertions(+), 2 deletions(-)
 >
 > diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
 > index 21e4a79..31d9817 100644
 > --- a/drivers/mmc/host/omap_hsmmc.c
 > +++ b/drivers/mmc/host/omap_hsmmc.c
 > @@ -1011,6 +1011,7 @@ static void omap_hsmmc_dma_cleanup(struct omap_hsmmc_host *host, int errno)
->                        host->data->sg_len,
->                        omap_hsmmc_get_dma_dir(host, host->data));
->                omap_free_dma(dma_ch);
-> +               host->data->host_cookie = 0;
->        }
->        host->data = NULL;
->  }
+> ? ? ? ? ? ? ? ? ? ? ? ?host->data->sg_len,
+> ? ? ? ? ? ? ? ? ? ? ? ?omap_hsmmc_get_dma_dir(host, host->data));
+> ? ? ? ? ? ? ? ?omap_free_dma(dma_ch);
+> + ? ? ? ? ? ? ? host->data->host_cookie = 0;
+> ? ? ? ?}
+> ? ? ? ?host->data = NULL;
+> ?}
 > @@ -1576,8 +1577,10 @@ static void omap_hsmmc_post_req(struct mmc_host *mmc, struct mmc_request *mrq,
->        struct mmc_data *data = mrq->data;
->
->        if (host->use_dma) {
-> -               dma_unmap_sg(mmc_dev(host->mmc), data->sg, data->sg_len,
-> -                            omap_hsmmc_get_dma_dir(host, data));
-> +               if (data->host_cookie)
-> +                       dma_unmap_sg(mmc_dev(host->mmc), data->sg,
-> +                                    data->sg_len,
-> +                                    omap_hsmmc_get_dma_dir(host, data));
->                data->host_cookie = 0;
->        }
->  }
+> ? ? ? ?struct mmc_data *data = mrq->data;
+>
+> ? ? ? ?if (host->use_dma) {
+> - ? ? ? ? ? ? ? dma_unmap_sg(mmc_dev(host->mmc), data->sg, data->sg_len,
+> - ? ? ? ? ? ? ? ? ? ? ? ? ? ?omap_hsmmc_get_dma_dir(host, data));
+> + ? ? ? ? ? ? ? if (data->host_cookie)
+> + ? ? ? ? ? ? ? ? ? ? ? dma_unmap_sg(mmc_dev(host->mmc), data->sg,
+> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?data->sg_len,
+> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?omap_hsmmc_get_dma_dir(host, data));
+> ? ? ? ? ? ? ? ?data->host_cookie = 0;
+> ? ? ? ?}
+> ?}
 > --
 > 1.7.4.1
 >
diff --git a/a/content_digest b/N1/content_digest
index 752fe55..35655f9 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,28 +2,16 @@
   "ref\0001314569323-6886-1-git-send-email-per.forlin\@linaro.org\0"
 ]
 [
-  "From\0S, Venkatraman <svenkatr\@ti.com>\0"
+  "From\0svenkatr\@ti.com (S, Venkatraman)\0"
 ]
 [
-  "Subject\0Re: [PATCH] mmc: omap_hsmmc: DMA unmap only once in case of MMC error\0"
+  "Subject\0[PATCH] mmc: omap_hsmmc: DMA unmap only once in case of MMC error\0"
 ]
 [
   "Date\0Fri, 2 Sep 2011 00:49:21 +0530\0"
 ]
 [
-  "To\0Per Forlin <per.forlin\@linaro.org>\0"
-]
-[
-  "Cc\0linaro-dev\@lists.linaro.org",
-  " linux-arm-kernel\@lists.infradead.org",
-  " linux-kernel\@vger.kernel.org",
-  " linux-mmc\@vger.kernel.org",
-  " Russell King - ARM Linux <linux\@arm.linux.org.uk>",
-  " Santosh <santosh.shilimkar\@ti.com>",
-  " Balaji T Krishnamoorthy <balajitk\@ti.com>",
-  " Sourav Poddar <sourav.poddar\@ti.com>",
-  " Chris Ball <cjb\@laptop.org>",
-  " Nicolas Pitre <nicolas.pitre\@linaro.org>\0"
+  "To\0linux-arm-kernel\@lists.infradead.org\0"
 ]
 [
   "\0000:1\0"
@@ -52,34 +40,34 @@
   "> ---\n",
   "> Bug fix on 3.1-rc3\n",
   ">\n",
-  "> \302\240drivers/mmc/host/omap_hsmmc.c | \302\240 \302\2407 +++++--\n",
-  "> \302\2401 files changed, 5 insertions(+), 2 deletions(-)\n",
+  "> ?drivers/mmc/host/omap_hsmmc.c | ? ?7 +++++--\n",
+  "> ?1 files changed, 5 insertions(+), 2 deletions(-)\n",
   ">\n",
   "> diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c\n",
   "> index 21e4a79..31d9817 100644\n",
   "> --- a/drivers/mmc/host/omap_hsmmc.c\n",
   "> +++ b/drivers/mmc/host/omap_hsmmc.c\n",
   "> \@\@ -1011,6 +1011,7 \@\@ static void omap_hsmmc_dma_cleanup(struct omap_hsmmc_host *host, int errno)\n",
-  "> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240host->data->sg_len,\n",
-  "> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240omap_hsmmc_get_dma_dir(host, host->data));\n",
-  "> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240omap_free_dma(dma_ch);\n",
-  "> + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 host->data->host_cookie = 0;\n",
-  "> \302\240 \302\240 \302\240 \302\240}\n",
-  "> \302\240 \302\240 \302\240 \302\240host->data = NULL;\n",
-  "> \302\240}\n",
+  "> ? ? ? ? ? ? ? ? ? ? ? ?host->data->sg_len,\n",
+  "> ? ? ? ? ? ? ? ? ? ? ? ?omap_hsmmc_get_dma_dir(host, host->data));\n",
+  "> ? ? ? ? ? ? ? ?omap_free_dma(dma_ch);\n",
+  "> + ? ? ? ? ? ? ? host->data->host_cookie = 0;\n",
+  "> ? ? ? ?}\n",
+  "> ? ? ? ?host->data = NULL;\n",
+  "> ?}\n",
   "> \@\@ -1576,8 +1577,10 \@\@ static void omap_hsmmc_post_req(struct mmc_host *mmc, struct mmc_request *mrq,\n",
-  "> \302\240 \302\240 \302\240 \302\240struct mmc_data *data = mrq->data;\n",
+  "> ? ? ? ?struct mmc_data *data = mrq->data;\n",
   ">\n",
-  "> \302\240 \302\240 \302\240 \302\240if (host->use_dma) {\n",
-  "> - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 dma_unmap_sg(mmc_dev(host->mmc), data->sg, data->sg_len,\n",
-  "> - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240omap_hsmmc_get_dma_dir(host, data));\n",
-  "> + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 if (data->host_cookie)\n",
-  "> + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 dma_unmap_sg(mmc_dev(host->mmc), data->sg,\n",
-  "> + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240data->sg_len,\n",
-  "> + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240omap_hsmmc_get_dma_dir(host, data));\n",
-  "> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240data->host_cookie = 0;\n",
-  "> \302\240 \302\240 \302\240 \302\240}\n",
-  "> \302\240}\n",
+  "> ? ? ? ?if (host->use_dma) {\n",
+  "> - ? ? ? ? ? ? ? dma_unmap_sg(mmc_dev(host->mmc), data->sg, data->sg_len,\n",
+  "> - ? ? ? ? ? ? ? ? ? ? ? ? ? ?omap_hsmmc_get_dma_dir(host, data));\n",
+  "> + ? ? ? ? ? ? ? if (data->host_cookie)\n",
+  "> + ? ? ? ? ? ? ? ? ? ? ? dma_unmap_sg(mmc_dev(host->mmc), data->sg,\n",
+  "> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?data->sg_len,\n",
+  "> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?omap_hsmmc_get_dma_dir(host, data));\n",
+  "> ? ? ? ? ? ? ? ?data->host_cookie = 0;\n",
+  "> ? ? ? ?}\n",
+  "> ?}\n",
   "> --\n",
   "> 1.7.4.1\n",
   ">\n",
@@ -93,4 +81,4 @@
   "[1]: http://marc.info/?l=linux-mmc&m=131490406920616&w=2"
 ]
 
-ab42d2e34db4e3c1118075065ea91fbdf4d2a5e6ab8513b1654932dcd5d2b7f2
+da8815e9212d50bf8413382b5124157458b65816b598e5a13b32dea8404687f1
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.