diff for duplicates of <10746939.zT8Pinqvll@avalon> diff --git a/a/1.txt b/N1/1.txt index 1cd8d20..778020e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,7 +2,7 @@ On Wednesday 10 December 2014 09:01:55 Wolfram Sang wrote: > On Wed, Dec 10, 2014 at 02:44:01PM +0900, Magnus Damm wrote: -> > On Tue, Dec 9, 2014 at 11:09 PM, Wolfram Sang <wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org> wrote: +> > On Tue, Dec 9, 2014 at 11:09 PM, Wolfram Sang <wsa@the-dreams.de> wrote: > >> On Tue, Dec 09, 2014 at 11:53:45AM +0100, Geert Uytterhoeven wrote: > >>> On Fri, Nov 7, 2014 at 11:11 AM, Wolfram Sang wrote: > >>>> --- a/drivers/i2c/busses/i2c-sh_mobile.c @@ -18,13 +18,13 @@ On Wednesday 10 December 2014 09:01:55 Wolfram Sang wrote: > >>>> + ret = sh_mobile_i2c_request_dma_chan(pd->dev, 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 5414414..4b5735a 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\0CANqRtoTs52ORCqY43OyPJ2ME7BBcQr3+RVGURjteFQAztDSZjg@mail.gmail.com\0" "ref\020141210080155.GA1148@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\0Wed, 10 Dec 2014 16:19:36 +0200\0" + "Date\0Wed, 10 Dec 2014 14:19:36 +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> @@ -17,7 +17,7 @@ "\n" "On Wednesday 10 December 2014 09:01:55 Wolfram Sang wrote:\n" "> On Wed, Dec 10, 2014 at 02:44:01PM +0900, Magnus Damm wrote:\n" - "> > On Tue, Dec 9, 2014 at 11:09 PM, Wolfram Sang <wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org> wrote:\n" + "> > On Tue, Dec 9, 2014 at 11:09 PM, Wolfram Sang <wsa@the-dreams.de> wrote:\n" "> >> On Tue, Dec 09, 2014 at 11:53:45AM +0100, Geert Uytterhoeven wrote:\n" "> >>> On Fri, Nov 7, 2014 at 11:11 AM, Wolfram Sang wrote:\n" "> >>>> --- a/drivers/i2c/busses/i2c-sh_mobile.c\n" @@ -33,13 +33,13 @@ "> >>>> + ret = sh_mobile_i2c_request_dma_chan(pd->dev, 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, 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" @@ -79,4 +79,4 @@ "\n" Laurent Pinchart -587c1a0166765899170fc64128e98869a4b04d76478e25f403efa4d14b5e4119 +4e9ca1f38fba425916b1109e84fe9e099c9979566a5cc2c7f0613dbf3b726648
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.