diff for duplicates of <1464772746.3079.4.camel@ziswiler.com>
diff --git a/a/1.txt b/N1/1.txt
index 59e98d7..cde2ff7 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -15,14 +15,14 @@ On Sun, 2016-05-29 at 15:04 +0800, Chen-Yu Tsai wrote:
This fixes the following eMMC issue as experienced on Apalis T30 as
well:
-[ 7.194625] mmc1: mmc_select_hs200 failed, error 3
-[ 7.201549] mmc1: error 3 whilst initialising MMC card
+[????7.194625] mmc1: mmc_select_hs200 failed, error 3
+[????7.201549] mmc1: error 3 whilst initialising MMC card
Tested-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> ---
-> drivers/mmc/core/mmc.c | 4 ++--
-> 1 file changed, 2 insertions(+), 2 deletions(-)
+> ?drivers/mmc/core/mmc.c | 4 ++--
+> ?1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
> index c984321d1881..aafb73d080ca 100644
@@ -30,21 +30,21 @@ Tested-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> +++ b/drivers/mmc/core/mmc.c
> @@ -1276,7 +1276,7 @@ static int mmc_select_hs200(struct mmc_card
> *card)
-> * switch to HS200 mode if bus width is set successfully.
-> */
-> err = mmc_select_bus_width(card);
+> ? ?* switch to HS200 mode if bus width is set successfully.
+> ? ?*/
+> ? err = mmc_select_bus_width(card);
> - if (!err) {
> + if (err > 0) {
-> val = EXT_CSD_TIMING_HS200 |
-> card->drive_strength << EXT_CSD_DRV_STR_SHIFT;
-> err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
+> ? val = EXT_CSD_TIMING_HS200 |
+> ? ??????card->drive_strength << EXT_CSD_DRV_STR_SHIFT;
+> ? err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
> @@ -1583,7 +1583,7 @@ static int mmc_init_card(struct mmc_host *host,
> u32 ocr,
-> } else if (mmc_card_hs(card)) {
-> /* Select the desired bus width optionally */
-> err = mmc_select_bus_width(card);
+> ? } else if (mmc_card_hs(card)) {
+> ? /* Select the desired bus width optionally */
+> ? err = mmc_select_bus_width(card);
> - if (!err) {
> + if (err > 0) {
-> err = mmc_select_hs_ddr(card);
-> if (err)
-> goto free_card;
\ No newline at end of file
+> ? err = mmc_select_hs_ddr(card);
+> ? if (err)
+> ? goto free_card;
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 0d826d4..706ecf2 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,26 +5,16 @@
"ref\0001464505484-3661-2-git-send-email-wens\@csie.org\0"
]
[
- "From\0Marcel Ziswiler <marcel\@ziswiler.com>\0"
+ "From\0marcel\@ziswiler.com (Marcel Ziswiler)\0"
]
[
- "Subject\0Re: [PATCH 1/3] mmc: fix mmc mode selection for HS-DDR and higher\0"
+ "Subject\0[PATCH 1/3] mmc: fix mmc mode selection for HS-DDR and higher\0"
]
[
"Date\0Wed, 01 Jun 2016 11:19:06 +0200\0"
]
[
- "To\0Chen-Yu Tsai <wens\@csie.org>",
- " Ulf Hansson <ulf.hansson\@linaro.org>",
- " Maxime Ripard <maxime.ripard\@free-electrons.com>\0"
-]
-[
- "Cc\0Hans de Goede <hdegoede\@redhat.com>",
- " linux-mmc\@vger.kernel.org",
- " linux-arm-kernel\@lists.infradead.org",
- " linux-kernel\@vger.kernel.org",
- " Arnd Bergmann <arnd\@arndb.de>",
- " linux-tegra\@vger.kernel.org\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -50,14 +40,14 @@
"This fixes the following eMMC issue as experienced on Apalis T30 as\n",
"well:\n",
"\n",
- "[\302\240\302\240\302\240\302\2407.194625] mmc1: mmc_select_hs200 failed, error 3\n",
- "[\302\240\302\240\302\240\302\2407.201549] mmc1: error 3 whilst initialising MMC card\n",
+ "[????7.194625] mmc1: mmc_select_hs200 failed, error 3\n",
+ "[????7.201549] mmc1: error 3 whilst initialising MMC card\n",
"\n",
"Tested-by: Marcel Ziswiler <marcel.ziswiler\@toradex.com>\n",
"\n",
"> ---\n",
- "> \302\240drivers/mmc/core/mmc.c | 4 ++--\n",
- "> \302\2401 file changed, 2 insertions(+), 2 deletions(-)\n",
+ "> ?drivers/mmc/core/mmc.c | 4 ++--\n",
+ "> ?1 file changed, 2 insertions(+), 2 deletions(-)\n",
"> \n",
"> diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c\n",
"> index c984321d1881..aafb73d080ca 100644\n",
@@ -65,24 +55,24 @@
"> +++ b/drivers/mmc/core/mmc.c\n",
"> \@\@ -1276,7 +1276,7 \@\@ static int mmc_select_hs200(struct mmc_card\n",
"> *card)\n",
- "> \302\240\t\302\240* switch to HS200 mode if bus width is set successfully.\n",
- "> \302\240\t\302\240*/\n",
- "> \302\240\terr = mmc_select_bus_width(card);\n",
+ "> ?\t?* switch to HS200 mode if bus width is set successfully.\n",
+ "> ?\t?*/\n",
+ "> ?\terr = mmc_select_bus_width(card);\n",
"> -\tif (!err) {\n",
"> +\tif (err > 0) {\n",
- "> \302\240\t\tval = EXT_CSD_TIMING_HS200 |\n",
- "> \302\240\t\t\302\240\302\240\302\240\302\240\302\240\302\240card->drive_strength << EXT_CSD_DRV_STR_SHIFT;\n",
- "> \302\240\t\terr = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,\n",
+ "> ?\t\tval = EXT_CSD_TIMING_HS200 |\n",
+ "> ?\t\t??????card->drive_strength << EXT_CSD_DRV_STR_SHIFT;\n",
+ "> ?\t\terr = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,\n",
"> \@\@ -1583,7 +1583,7 \@\@ static int mmc_init_card(struct mmc_host *host,\n",
"> u32 ocr,\n",
- "> \302\240\t} else if (mmc_card_hs(card)) {\n",
- "> \302\240\t\t/* Select the desired bus width optionally */\n",
- "> \302\240\t\terr = mmc_select_bus_width(card);\n",
+ "> ?\t} else if (mmc_card_hs(card)) {\n",
+ "> ?\t\t/* Select the desired bus width optionally */\n",
+ "> ?\t\terr = mmc_select_bus_width(card);\n",
"> -\t\tif (!err) {\n",
"> +\t\tif (err > 0) {\n",
- "> \302\240\t\t\terr = mmc_select_hs_ddr(card);\n",
- "> \302\240\t\t\tif (err)\n",
- "> \302\240\t\t\t\tgoto free_card;"
+ "> ?\t\t\terr = mmc_select_hs_ddr(card);\n",
+ "> ?\t\t\tif (err)\n",
+ "> ?\t\t\t\tgoto free_card;"
]
-1ac5e5860fa496106f4a73c295cef3aa3e9c35fa27a6aea7a42be6ef0c036d6e
+e96faf78f9511011dc5517a8c249b00cae8c4c6e8eac993e03900122c863ed1e
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.