diff for duplicates of <20130617064052.3573.68839.sendpatchset@w520> diff --git a/a/1.txt b/N1/1.txt index 0846b3f..6c69c56 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -85,7 +85,7 @@ Signed-off-by: Magnus Damm <damm@opensource.se> + p->mapbase_str = ioremap_nocache(res2 ? res2->start : + res->start - cfg->channel_offset, + res2 ? resource_size(res2) : 2); -+ if (p->mapbase_str = NULL) { ++ if (p->mapbase_str == NULL) { + dev_err(&p->pdev->dev, "failed to remap I/O second memory\n"); + goto err1; + } @@ -103,7 +103,7 @@ Signed-off-by: Magnus Damm <damm@opensource.se> - p->read_control = sh_cmt_read16; - p->write_control = sh_cmt_write16; -+ if (res2 && (resource_size(res2) = 4)) { ++ if (res2 && (resource_size(res2) == 4)) { + /* assume both CMSTR and CMCSR to be 32-bit */ + p->read_control = sh_cmt_read32; + p->write_control = sh_cmt_write32; @@ -112,7 +112,7 @@ Signed-off-by: Magnus Damm <damm@opensource.se> + p->write_control = sh_cmt_write16; + } - if (resource_size(res) = 6) { + if (resource_size(res) == 6) { p->width = 16; @@ -752,22 +773,23 @@ static int sh_cmt_setup(struct sh_cmt_pr cfg->clocksource_rating); diff --git a/a/content_digest b/N1/content_digest index 7649011..fd26571 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,6 @@ - "ref\020121214060026.10668.35031.sendpatchset@w520\0" "From\0Magnus Damm <magnus.damm@gmail.com>\0" "Subject\0[PATCH] clocksource: sh_cmt: 32-bit control register support\0" - "Date\0Mon, 17 Jun 2013 06:40:52 +0000\0" + "Date\0Mon, 17 Jun 2013 15:40:52 +0900\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0linux-sh@vger.kernel.org" johnstul@us.ibm.com @@ -98,7 +97,7 @@ "+\tp->mapbase_str = ioremap_nocache(res2 ? res2->start :\n" "+\t\t\t\t\t res->start - cfg->channel_offset,\n" "+\t\t\t\t\t res2 ? resource_size(res2) : 2);\n" - "+\tif (p->mapbase_str = NULL) {\n" + "+\tif (p->mapbase_str == NULL) {\n" "+\t\tdev_err(&p->pdev->dev, \"failed to remap I/O second memory\\n\");\n" "+\t\tgoto err1;\n" "+\t}\n" @@ -116,7 +115,7 @@ " \n" "-\tp->read_control = sh_cmt_read16;\n" "-\tp->write_control = sh_cmt_write16;\n" - "+\tif (res2 && (resource_size(res2) = 4)) {\n" + "+\tif (res2 && (resource_size(res2) == 4)) {\n" "+\t\t/* assume both CMSTR and CMCSR to be 32-bit */\n" "+\t\tp->read_control = sh_cmt_read32;\n" "+\t\tp->write_control = sh_cmt_write32;\n" @@ -125,7 +124,7 @@ "+\t\tp->write_control = sh_cmt_write16;\n" "+\t}\n" " \n" - " \tif (resource_size(res) = 6) {\n" + " \tif (resource_size(res) == 6) {\n" " \t\tp->width = 16;\n" "@@ -752,22 +773,23 @@ static int sh_cmt_setup(struct sh_cmt_pr\n" " \t\t\t cfg->clocksource_rating);\n" @@ -156,4 +155,4 @@ " \tiounmap(p->mapbase);\n" err0: -b640548f68a4d37c43f9f095ef67277be9b0f86cbb21aee1d68b3d09ab25c8f6 +bec9f74a6a4153b2176e1fa747c4b991bdf8b2c23c28f6a3882ebe3def16c60b
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.