diff for duplicates of <54C41FD0.2010607@interlog.com> diff --git a/a/1.txt b/N1/1.txt index 9671007..d2e7d6d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -57,14 +57,14 @@ Tests done with lk 3.19.0-rc4 using a AT91SAM9G25 system (Acme Arietta). For the attached patch: - Signed-off-by: Douglas Gilbert <dgilbert-qazKcTl6WRFWk0Htik3J/w@public.gmane.org> + Signed-off-by: Douglas Gilbert <dgilbert@interlog.com> >> Regards >> >> Ludovic >> ->>> Signed-off-by: Douglas Gilbert <dgilbert-qazKcTl6WRFWk0Htik3J/w@public.gmane.org> +>>> Signed-off-by: Douglas Gilbert <dgilbert@interlog.com> >> >>> diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c >>> index 636fd2e..4d78708 100644 @@ -100,3 +100,11 @@ For the attached patch: >>> } >>> >> + +-------------- next part -------------- +A non-text attachment was scrubbed... +Name: i2c-at91_tmout2.patch +Type: text/x-patch +Size: 1570 bytes +Desc: not available +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150124/c0035c2f/attachment.bin> diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index ff7b2f7..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,5 +0,0 @@ -Content-Type: text/x-patch; - name="i2c-at91_tmout2.patch" -Content-Transfer-Encoding: 7bit -Content-Disposition: attachment; - filename="i2c-at91_tmout2.patch" diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index 41854e5..0000000 --- a/a/2.txt +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 91bd5bd..b2a6fbe 100644 ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -41,6 +41,10 @@ dtb-$(CONFIG_ARCH_AT91) += at91sam9g25ek.dtb - dtb-$(CONFIG_ARCH_AT91) += at91sam9g35ek.dtb - dtb-$(CONFIG_ARCH_AT91) += at91sam9x25ek.dtb - dtb-$(CONFIG_ARCH_AT91) += at91sam9x35ek.dtb -+dtb-$(CONFIG_ARCH_AT91) += acme-arietta.dtb -+dtb-$(CONFIG_ARCH_AT91) += acme-arietta_sc16.dtb -+dtb-$(CONFIG_ARCH_AT91) += at91-aria_cb.dtb -+dtb-$(CONFIG_ARCH_AT91) += at91-aria_mg25.dtb - # sama5d3 - dtb-$(CONFIG_ARCH_AT91) += at91-sama5d3_xplained.dtb - dtb-$(CONFIG_ARCH_AT91) += sama5d31ek.dtb -diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c -index 636fd2e..fcaf01c 100644 ---- a/drivers/i2c/busses/i2c-at91.c -+++ b/drivers/i2c/busses/i2c-at91.c -@@ -382,6 +382,7 @@ static int at91_do_twi_transfer(struct at91_twi_dev *dev) - { - int ret; - bool has_unre_flag = dev->pdata->has_unre_flag; -+ bool timed_out = false; - - dev_dbg(dev->dev, "transfer: %s %d bytes.\n", - (dev->msg->flags & I2C_M_RD) ? "read" : "write", dev->buf_len); -@@ -440,7 +441,7 @@ static int at91_do_twi_transfer(struct at91_twi_dev *dev) - dev->adapter.timeout); - if (ret == 0) { - dev_err(dev->dev, "controller timed out\n"); -- at91_init_twi_bus(dev); -+ timed_out = true; - ret = -ETIMEDOUT; - goto error; - } -@@ -471,6 +472,8 @@ static int at91_do_twi_transfer(struct at91_twi_dev *dev) - - error: - at91_twi_dma_cleanup(dev); -+ if (timed_out) -+ at91_init_twi_bus(dev); - return ret; - } diff --git a/a/content_digest b/N1/content_digest index 78c604e..291ba1b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,11 @@ "ref\054A58BA5.3080003@interlog.com\0" "ref\020150107103113.GA30897@ldesroches-Latitude-E6320\0" "ref\020150113152752.GK7660@katana\0" - "From\0Douglas Gilbert <dgilbert-qazKcTl6WRFWk0Htik3J/w@public.gmane.org>\0" - "Subject\0Re: [PATCH] at91: i2c-at91: improve time-out handling\0" + "From\0dgilbert@interlog.com (Douglas Gilbert)\0" + "Subject\0[PATCH] at91: i2c-at91: improve time-out handling\0" "Date\0Sat, 24 Jan 2015 23:42:24 +0100\0" - "To\0Wolfram Sang <wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org>" - linux-arm-kernel <linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org> - " Linux I2C <linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>\0" - "Cc\0patchwork-notifications-2CcfMPLixEJ8D7ILJbWmE2D2FQJk+8+b@public.gmane.org\0" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" "On 15-01-13 04:27 PM, Wolfram Sang wrote:\n" "> On Wed, Jan 07, 2015 at 11:31:14AM +0100, Ludovic Desroches wrote:\n" @@ -69,14 +66,14 @@ "(Acme Arietta).\n" "\n" "For the attached patch:\n" - " Signed-off-by: Douglas Gilbert <dgilbert-qazKcTl6WRFWk0Htik3J/w@public.gmane.org>\n" + " Signed-off-by: Douglas Gilbert <dgilbert@interlog.com>\n" "\n" "\n" ">> Regards\n" ">>\n" ">> Ludovic\n" ">>\n" - ">>> Signed-off-by: Douglas Gilbert <dgilbert-qazKcTl6WRFWk0Htik3J/w@public.gmane.org>\n" + ">>> Signed-off-by: Douglas Gilbert <dgilbert@interlog.com>\n" ">>\n" ">>> diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c\n" ">>> index 636fd2e..4d78708 100644\n" @@ -111,53 +108,14 @@ ">>> \treturn ret;\n" ">>> }\n" ">>>\n" - >> - "\01:2\0" - "fn\0i2c-at91_tmout2.patch\0" - "b\0" - "diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile\n" - "index 91bd5bd..b2a6fbe 100644\n" - "--- a/arch/arm/boot/dts/Makefile\n" - "+++ b/arch/arm/boot/dts/Makefile\n" - "@@ -41,6 +41,10 @@ dtb-$(CONFIG_ARCH_AT91) += at91sam9g25ek.dtb\n" - " dtb-$(CONFIG_ARCH_AT91) += at91sam9g35ek.dtb\n" - " dtb-$(CONFIG_ARCH_AT91) += at91sam9x25ek.dtb\n" - " dtb-$(CONFIG_ARCH_AT91) += at91sam9x35ek.dtb\n" - "+dtb-$(CONFIG_ARCH_AT91) += acme-arietta.dtb\n" - "+dtb-$(CONFIG_ARCH_AT91) += acme-arietta_sc16.dtb\n" - "+dtb-$(CONFIG_ARCH_AT91) += at91-aria_cb.dtb\n" - "+dtb-$(CONFIG_ARCH_AT91) += at91-aria_mg25.dtb\n" - " # sama5d3\n" - " dtb-$(CONFIG_ARCH_AT91)\t+= at91-sama5d3_xplained.dtb\n" - " dtb-$(CONFIG_ARCH_AT91)\t+= sama5d31ek.dtb\n" - "diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c\n" - "index 636fd2e..fcaf01c 100644\n" - "--- a/drivers/i2c/busses/i2c-at91.c\n" - "+++ b/drivers/i2c/busses/i2c-at91.c\n" - "@@ -382,6 +382,7 @@ static int at91_do_twi_transfer(struct at91_twi_dev *dev)\n" - " {\n" - " \tint ret;\n" - " \tbool has_unre_flag = dev->pdata->has_unre_flag;\n" - "+\tbool timed_out = false;\n" - " \n" - " \tdev_dbg(dev->dev, \"transfer: %s %d bytes.\\n\",\n" - " \t\t(dev->msg->flags & I2C_M_RD) ? \"read\" : \"write\", dev->buf_len);\n" - "@@ -440,7 +441,7 @@ static int at91_do_twi_transfer(struct at91_twi_dev *dev)\n" - " \t\t\t\t\t dev->adapter.timeout);\n" - " \tif (ret == 0) {\n" - " \t\tdev_err(dev->dev, \"controller timed out\\n\");\n" - "-\t\tat91_init_twi_bus(dev);\n" - "+\t\ttimed_out = true;\n" - " \t\tret = -ETIMEDOUT;\n" - " \t\tgoto error;\n" - " \t}\n" - "@@ -471,6 +472,8 @@ static int at91_do_twi_transfer(struct at91_twi_dev *dev)\n" - " \n" - " error:\n" - " \tat91_twi_dma_cleanup(dev);\n" - "+\tif (timed_out)\n" - "+\t\tat91_init_twi_bus(dev);\n" - " \treturn ret;\n" - } + ">>\n" + "\n" + "-------------- next part --------------\n" + "A non-text attachment was scrubbed...\n" + "Name: i2c-at91_tmout2.patch\n" + "Type: text/x-patch\n" + "Size: 1570 bytes\n" + "Desc: not available\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150124/c0035c2f/attachment.bin> -05f08c173578e9cd61c1c7e1c128eb102a4ed1e5c49b0b428fa79a2a6fb6166a +455b6fee7c02f9160547db247894b9cfc8cf0b390a2c7c7bd1fa7947d3b4010c
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.