diff for duplicates of <20081206163449.60757c4a.akpm@linux-foundation.org> diff --git a/a/1.txt b/N1/1.txt index 00ae931..7cec34c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -6,11 +6,11 @@ On Tue, 2 Dec 2008 14:45:18 +0100 Nicolas Palix <npalix@diku.dk> wrote: > struct resource rsrc; > > vias = of_find_node_by_name(NULL, "via-cuda"); -> if (vias = 0) +> if (vias == 0) > vias = of_find_node_by_name(NULL, "via-pmu"); -> if (vias = 0) +> if (vias == 0) > vias = of_find_node_by_name(NULL, "via"); -> if (vias = 0 || of_address_to_resource(vias, 0, &rsrc)) +> if (vias == 0 || of_address_to_resource(vias, 0, &rsrc)) > return 0; > + of_node_put(vias); > + @@ -107,13 +107,13 @@ diff -puN arch/powerpc/platforms/powermac/time.c~powerpc-powermac-add-missing-of --- a/arch/powerpc/platforms/powermac/time.c~powerpc-powermac-add-missing-of_node_put +++ a/arch/powerpc/platforms/powermac/time.c @@ -270,11 +270,11 @@ int __init via_calibrate_decr(void) - if (vias = 0) + if (vias == 0) vias = of_find_node_by_name(NULL, "via"); - if (vias = 0 || of_address_to_resource(vias, 0, &rsrc)) + if (vias == 0 || of_address_to_resource(vias, 0, &rsrc)) - return 0; + goto fail; via = ioremap(rsrc.start, rsrc.end - rsrc.start + 1); - if (via = NULL) { + if (via == NULL) { printk(KERN_ERR "Failed to map VIA for timer calibration !\n"); - return 0; + goto fail; diff --git a/a/content_digest b/N1/content_digest index 733180a..c2d9726 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0200812021445.18670.npalix@diku.dk\0" "From\0Andrew Morton <akpm@linux-foundation.org>\0" "Subject\0Re: [PATCH linux-next] powerpc/powermac: Add missing of_node_put\0" - "Date\0Sun, 07 Dec 2008 00:34:49 +0000\0" + "Date\0Sat, 6 Dec 2008 16:34:49 -0800\0" "To\0Nicolas Palix <npalix@diku.dk>\0" "Cc\0kernel-janitors@vger.kernel.org" linux-kernel@vger.kernel.org @@ -18,11 +18,11 @@ "> \tstruct resource rsrc;\n" "> \n" "> \tvias = of_find_node_by_name(NULL, \"via-cuda\");\n" - "> \tif (vias = 0)\n" + "> \tif (vias == 0)\n" "> \t\tvias = of_find_node_by_name(NULL, \"via-pmu\");\n" - "> \tif (vias = 0)\n" + "> \tif (vias == 0)\n" "> \t\tvias = of_find_node_by_name(NULL, \"via\");\n" - "> \tif (vias = 0 || of_address_to_resource(vias, 0, &rsrc))\n" + "> \tif (vias == 0 || of_address_to_resource(vias, 0, &rsrc))\n" "> \t\treturn 0;\n" "> +\tof_node_put(vias);\n" "> +\n" @@ -119,13 +119,13 @@ "--- a/arch/powerpc/platforms/powermac/time.c~powerpc-powermac-add-missing-of_node_put\n" "+++ a/arch/powerpc/platforms/powermac/time.c\n" "@@ -270,11 +270,11 @@ int __init via_calibrate_decr(void)\n" - " \tif (vias = 0)\n" + " \tif (vias == 0)\n" " \t\tvias = of_find_node_by_name(NULL, \"via\");\n" - " \tif (vias = 0 || of_address_to_resource(vias, 0, &rsrc))\n" + " \tif (vias == 0 || of_address_to_resource(vias, 0, &rsrc))\n" "-\t\treturn 0;\n" "+\t\tgoto fail;\n" " \tvia = ioremap(rsrc.start, rsrc.end - rsrc.start + 1);\n" - " \tif (via = NULL) {\n" + " \tif (via == NULL) {\n" " \t\tprintk(KERN_ERR \"Failed to map VIA for timer calibration !\\n\");\n" "-\t\treturn 0;\n" "+\t\tgoto fail;\n" @@ -147,4 +147,4 @@ " \n" _ -4e375e4086852d76c0db782d07d9d32404727524f65a87cd3ac4e1f3377d5c10 +faad2cf5041427d61d97df92b2ef68de56cd9882b107a92e355da2f949e41332
diff --git a/a/1.txt b/N2/1.txt index 00ae931..7cec34c 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -6,11 +6,11 @@ On Tue, 2 Dec 2008 14:45:18 +0100 Nicolas Palix <npalix@diku.dk> wrote: > struct resource rsrc; > > vias = of_find_node_by_name(NULL, "via-cuda"); -> if (vias = 0) +> if (vias == 0) > vias = of_find_node_by_name(NULL, "via-pmu"); -> if (vias = 0) +> if (vias == 0) > vias = of_find_node_by_name(NULL, "via"); -> if (vias = 0 || of_address_to_resource(vias, 0, &rsrc)) +> if (vias == 0 || of_address_to_resource(vias, 0, &rsrc)) > return 0; > + of_node_put(vias); > + @@ -107,13 +107,13 @@ diff -puN arch/powerpc/platforms/powermac/time.c~powerpc-powermac-add-missing-of --- a/arch/powerpc/platforms/powermac/time.c~powerpc-powermac-add-missing-of_node_put +++ a/arch/powerpc/platforms/powermac/time.c @@ -270,11 +270,11 @@ int __init via_calibrate_decr(void) - if (vias = 0) + if (vias == 0) vias = of_find_node_by_name(NULL, "via"); - if (vias = 0 || of_address_to_resource(vias, 0, &rsrc)) + if (vias == 0 || of_address_to_resource(vias, 0, &rsrc)) - return 0; + goto fail; via = ioremap(rsrc.start, rsrc.end - rsrc.start + 1); - if (via = NULL) { + if (via == NULL) { printk(KERN_ERR "Failed to map VIA for timer calibration !\n"); - return 0; + goto fail; diff --git a/a/content_digest b/N2/content_digest index 733180a..6df8143 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,13 +1,14 @@ "ref\0200812021445.18670.npalix@diku.dk\0" "From\0Andrew Morton <akpm@linux-foundation.org>\0" "Subject\0Re: [PATCH linux-next] powerpc/powermac: Add missing of_node_put\0" - "Date\0Sun, 07 Dec 2008 00:34:49 +0000\0" + "Date\0Sat, 6 Dec 2008 16:34:49 -0800\0" "To\0Nicolas Palix <npalix@diku.dk>\0" - "Cc\0kernel-janitors@vger.kernel.org" - linux-kernel@vger.kernel.org + "Cc\0paulus@samba.org" + benh@kernel.crashing.org linuxppc-dev@ozlabs.org - Julia Lawall <julia@diku.dk> - " paulus@samba.org\0" + linux-kernel@vger.kernel.org + kernel-janitors@vger.kernel.org + " Julia Lawall <julia@diku.dk>\0" "\00:1\0" "b\0" "On Tue, 2 Dec 2008 14:45:18 +0100 Nicolas Palix <npalix@diku.dk> wrote:\n" @@ -18,11 +19,11 @@ "> \tstruct resource rsrc;\n" "> \n" "> \tvias = of_find_node_by_name(NULL, \"via-cuda\");\n" - "> \tif (vias = 0)\n" + "> \tif (vias == 0)\n" "> \t\tvias = of_find_node_by_name(NULL, \"via-pmu\");\n" - "> \tif (vias = 0)\n" + "> \tif (vias == 0)\n" "> \t\tvias = of_find_node_by_name(NULL, \"via\");\n" - "> \tif (vias = 0 || of_address_to_resource(vias, 0, &rsrc))\n" + "> \tif (vias == 0 || of_address_to_resource(vias, 0, &rsrc))\n" "> \t\treturn 0;\n" "> +\tof_node_put(vias);\n" "> +\n" @@ -119,13 +120,13 @@ "--- a/arch/powerpc/platforms/powermac/time.c~powerpc-powermac-add-missing-of_node_put\n" "+++ a/arch/powerpc/platforms/powermac/time.c\n" "@@ -270,11 +270,11 @@ int __init via_calibrate_decr(void)\n" - " \tif (vias = 0)\n" + " \tif (vias == 0)\n" " \t\tvias = of_find_node_by_name(NULL, \"via\");\n" - " \tif (vias = 0 || of_address_to_resource(vias, 0, &rsrc))\n" + " \tif (vias == 0 || of_address_to_resource(vias, 0, &rsrc))\n" "-\t\treturn 0;\n" "+\t\tgoto fail;\n" " \tvia = ioremap(rsrc.start, rsrc.end - rsrc.start + 1);\n" - " \tif (via = NULL) {\n" + " \tif (via == NULL) {\n" " \t\tprintk(KERN_ERR \"Failed to map VIA for timer calibration !\\n\");\n" "-\t\treturn 0;\n" "+\t\tgoto fail;\n" @@ -147,4 +148,4 @@ " \n" _ -4e375e4086852d76c0db782d07d9d32404727524f65a87cd3ac4e1f3377d5c10 +c142a4de803d6ff3ec39b0e3238f77479b9f2baa3ced5713a6c3f269cd3e5378
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.