diff for duplicates of <1597172.lxipa1bjlr@avalon> diff --git a/a/1.txt b/N1/1.txt index 393acd6..3ce90fb 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -95,7 +95,7 @@ will contain all the registers ? > + 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; > + } @@ -113,7 +113,7 @@ will contain all the registers ? > > - 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; @@ -122,7 +122,7 @@ will contain all the registers ? > + 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 35eadd7..9e1ecac 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020130617064052.3573.68839.sendpatchset@w520\0" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [PATCH] clocksource: sh_cmt: 32-bit control register support\0" - "Date\0Mon, 17 Jun 2013 18:37:07 +0000\0" + "Date\0Mon, 17 Jun 2013 20:37:07 +0200\0" "To\0Magnus Damm <magnus.damm@gmail.com>\0" "Cc\0linux-kernel@vger.kernel.org" linux-sh@vger.kernel.org @@ -108,7 +108,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" @@ -126,7 +126,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" @@ -135,7 +135,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" @@ -174,4 +174,4 @@ "\n" Laurent Pinchart -816b6c0197e01d6661211ef3c4baff38373b4a6676bf49f9b1f761c6bfc35cf9 +6e4e43d5eef4dd7acf13c8e8bd150d6811d18941612bde7491fca22754634ae2
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.