diff for duplicates of <2462101.Er8OZg9N24@avalon> diff --git a/a/1.txt b/N1/1.txt index 4be883c..4b51ccf 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -27,14 +27,14 @@ On Wednesday 10 December 2014 15:23:15 Wolfram Sang wrote: > > > >>>> DMA_DEV_TO_MEM, > > > >>>> + res->start + ICDR, > > > >>>> &pd->dma_rx); -> > > >>>> + if (ret == -EPROBE_DEFER) +> > > >>>> + if (ret = -EPROBE_DEFER) > > > >>>> + return ret; > > > >>>> + > > > >>>> + ret = sh_mobile_i2c_request_dma_chan(pd->dev, > > > >>>> DMA_MEM_TO_DEV, > > > >>>> + res->start + ICDR, > > > >>>> &pd->dma_tx); -> > > >>>> + if (ret == -EPROBE_DEFER) { +> > > >>>> + if (ret = -EPROBE_DEFER) { > > > >>>> + sh_mobile_i2c_release_dma(pd); > > > >>>> + return ret; > > > >>>> + } diff --git a/a/content_digest b/N1/content_digest index d109dd9..a731aa3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,9 @@ "ref\01415355104-2031-1-git-send-email-wsa@the-dreams.de\0" "ref\010746939.zT8Pinqvll@avalon\0" "ref\020141210142314.GB8247@katana\0" - "From\0Laurent Pinchart <laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>\0" + "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [PATCH 2/5] i2c: sh_mobile: add DMA support\0" - "Date\0Thu, 11 Dec 2014 23:42:47 +0200\0" + "Date\0Thu, 11 Dec 2014 21:42:47 +0000\0" "To\0Wolfram Sang <wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org>\0" "Cc\0Magnus Damm <magnus.damm-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>" Geert Uytterhoeven <geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org> @@ -42,14 +42,14 @@ "> > > >>>> DMA_DEV_TO_MEM,\n" "> > > >>>> + res->start + ICDR,\n" "> > > >>>> &pd->dma_rx);\n" - "> > > >>>> + if (ret == -EPROBE_DEFER)\n" + "> > > >>>> + if (ret = -EPROBE_DEFER)\n" "> > > >>>> + return ret;\n" "> > > >>>> +\n" "> > > >>>> + ret = sh_mobile_i2c_request_dma_chan(pd->dev,\n" "> > > >>>> DMA_MEM_TO_DEV,\n" "> > > >>>> + res->start + ICDR,\n" "> > > >>>> &pd->dma_tx);\n" - "> > > >>>> + if (ret == -EPROBE_DEFER) {\n" + "> > > >>>> + if (ret = -EPROBE_DEFER) {\n" "> > > >>>> + sh_mobile_i2c_release_dma(pd);\n" "> > > >>>> + return ret;\n" "> > > >>>> + }\n" @@ -100,4 +100,4 @@ "\n" Laurent Pinchart -bcbe7948bdd450666047124b4eee11abe39d02936d71c141e22428b70b4205fd +f22abed357d377c33ad4928ebc8dc0d1e50af63a5611e7fa3494a662780ba313
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.