diff for duplicates of <20120503125611.4314.52231.sendpatchset@w520> diff --git a/a/1.txt b/N1/1.txt index 9d8ab51..fa69489 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -37,7 +37,8 @@ Signed-off-by: Magnus Damm <damm@opensource.se> config SH_CLK_CPG --- 0001/drivers/clocksource/Makefile +++ work/drivers/clocksource/Makefile 2012-05-03 21:41:34.000000000 +0900 -@@ -6,6 +6,7 @@ obj-$(CONFIG_CS5535_CLOCK_EVENT_SRC) + obj-$(CONFIG_SH_TIMER_CMT) += sh_cmt.o +@@ -6,6 +6,7 @@ obj-$(CONFIG_CS5535_CLOCK_EVENT_SRC) += + obj-$(CONFIG_SH_TIMER_CMT) += sh_cmt.o obj-$(CONFIG_SH_TIMER_MTU2) += sh_mtu2.o obj-$(CONFIG_SH_TIMER_TMU) += sh_tmu.o +obj-$(CONFIG_EM_TIMER_STI) += em_sti.o @@ -211,7 +212,7 @@ Signed-off-by: Magnus Damm <damm@opensource.se> + struct em_sti_priv *p = dev_id; + + /* Always regprogram timer compare A */ -+ if (p->ced.mode = CLOCK_EVT_MODE_PERIODIC) ++ if (p->ced.mode == CLOCK_EVT_MODE_PERIODIC) + em_sti_update(p); + + p->ced.event_handler(&p->ced); @@ -418,7 +419,7 @@ Signed-off-by: Magnus Damm <damm@opensource.se> + + /* map memory, let base point to the STI instance */ + p->base = ioremap_nocache(res->start, resource_size(res)); -+ if (p->base = NULL) { ++ if (p->base == NULL) { + dev_err(&pdev->dev, "failed to remap I/O memory\n"); + goto err0; + } @@ -467,7 +468,7 @@ Signed-off-by: Magnus Damm <damm@opensource.se> + } + + p = kmalloc(sizeof(*p), GFP_KERNEL); -+ if (p = NULL) { ++ if (p == NULL) { + dev_err(&pdev->dev, "failed to allocate driver data\n"); + return -ENOMEM; + } diff --git a/a/content_digest b/N1/content_digest index 2283b8f..1e45d32 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Magnus Damm <magnus.damm@gmail.com>\0" "Subject\0[PATCH] clocksource: em_sti: Emma Mobile STI driver\0" - "Date\0Thu, 03 May 2012 12:56:11 +0000\0" + "Date\0Thu, 03 May 2012 21:56:11 +0900\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0horms@verge.net.au" arnd@arndb.de @@ -53,7 +53,8 @@ " config SH_CLK_CPG\n" "--- 0001/drivers/clocksource/Makefile\n" "+++ work/drivers/clocksource/Makefile\t2012-05-03 21:41:34.000000000 +0900\n" - "@@ -6,6 +6,7 @@ obj-$(CONFIG_CS5535_CLOCK_EVENT_SRC)\t+ obj-$(CONFIG_SH_TIMER_CMT)\t+= sh_cmt.o\n" + "@@ -6,6 +6,7 @@ obj-$(CONFIG_CS5535_CLOCK_EVENT_SRC)\t+=\n" + " obj-$(CONFIG_SH_TIMER_CMT)\t+= sh_cmt.o\n" " obj-$(CONFIG_SH_TIMER_MTU2)\t+= sh_mtu2.o\n" " obj-$(CONFIG_SH_TIMER_TMU)\t+= sh_tmu.o\n" "+obj-$(CONFIG_EM_TIMER_STI)\t+= em_sti.o\n" @@ -227,7 +228,7 @@ "+\tstruct em_sti_priv *p = dev_id;\n" "+\n" "+\t/* Always regprogram timer compare A */\n" - "+\tif (p->ced.mode = CLOCK_EVT_MODE_PERIODIC)\n" + "+\tif (p->ced.mode == CLOCK_EVT_MODE_PERIODIC)\n" "+\t\tem_sti_update(p);\n" "+\n" "+\tp->ced.event_handler(&p->ced);\n" @@ -434,7 +435,7 @@ "+\n" "+\t/* map memory, let base point to the STI instance */\n" "+\tp->base = ioremap_nocache(res->start, resource_size(res));\n" - "+\tif (p->base = NULL) {\n" + "+\tif (p->base == NULL) {\n" "+\t\tdev_err(&pdev->dev, \"failed to remap I/O memory\\n\");\n" "+\t\tgoto err0;\n" "+\t}\n" @@ -483,7 +484,7 @@ "+\t}\n" "+\n" "+\tp = kmalloc(sizeof(*p), GFP_KERNEL);\n" - "+\tif (p = NULL) {\n" + "+\tif (p == NULL) {\n" "+\t\tdev_err(&pdev->dev, \"failed to allocate driver data\\n\");\n" "+\t\treturn -ENOMEM;\n" "+\t}\n" @@ -514,4 +515,4 @@ "+MODULE_DESCRIPTION(\"Renesas Emma Mobile STI Timer Driver\");\n" "+MODULE_LICENSE(\"GPL v2\");" -f1c1e12f0b7e380065def45bcb2feca507ac8cf5d0b4e0cc7896049c392d3b1a +ea2400fc6f6400bfb6bfd4a1975990bf1012331f28b7d799ff174bd9e73af021
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.