diff for duplicates of <20120525070344.23443.69756.sendpatchset@w520> diff --git a/a/1.txt b/N1/1.txt index 5acf0e1..2e26638 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -61,7 +61,8 @@ Signed-off-by: Magnus Damm <damm@opensource.se> config SH_CLK_CPG --- 0001/drivers/clocksource/Makefile +++ work/drivers/clocksource/Makefile 2012-05-25 15:18:20.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 @@ -391,7 +392,7 @@ Signed-off-by: Magnus Damm <damm@opensource.se> + int irq, ret; + + p = kzalloc(sizeof(*p), GFP_KERNEL); -+ if (p = NULL) { ++ if (p == NULL) { + dev_err(&pdev->dev, "failed to allocate driver data\n"); + ret = -ENOMEM; + goto err0; @@ -416,7 +417,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"); + ret = -ENXIO; + goto err0; diff --git a/a/content_digest b/N1/content_digest index 394ae0d..ab8408d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,6 @@ - "ref\020120503125611.4314.52231.sendpatchset@w520\0" "From\0Magnus Damm <magnus.damm@gmail.com>\0" "Subject\0[PATCH] clocksource: em_sti: Emma Mobile STI driver V3\0" - "Date\0Fri, 25 May 2012 07:03:44 +0000\0" + "Date\0Fri, 25 May 2012 16:03:44 +0900\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0horms@verge.net.au" arnd@arndb.de @@ -78,7 +77,8 @@ " config SH_CLK_CPG\n" "--- 0001/drivers/clocksource/Makefile\n" "+++ work/drivers/clocksource/Makefile\t2012-05-25 15:18:20.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" @@ -408,7 +408,7 @@ "+\tint irq, ret;\n" "+\n" "+\tp = kzalloc(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\tret = -ENOMEM;\n" "+\t\tgoto err0;\n" @@ -433,7 +433,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\tret = -ENXIO;\n" "+\t\tgoto err0;\n" @@ -488,4 +488,4 @@ "+MODULE_DESCRIPTION(\"Renesas Emma Mobile STI Timer Driver\");\n" "+MODULE_LICENSE(\"GPL v2\");" -c88e071342d6830c2958a080d1757ed95b11b9e9d668c94a98ec4ac136919565 +1610d883f90934d17b6fce485dfc1789a16416b1b7fa04b75c7fdb7cf74a8869
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.