diff for duplicates of <20200612121133.GA1139533@mwanda> diff --git a/a/1.txt b/N1/1.txt index 8a29dfb..240b364 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -36,7 +36,7 @@ index 40387d58c8e7..d2da5bf9f552 100644 +{ + int ret; + -+ if (drvdata->ctidev.cpu = -1) ++ if (drvdata->ctidev.cpu == -1) + return 0; + + if (nr_cti_cpu) @@ -70,9 +70,9 @@ index 40387d58c8e7..d2da5bf9f552 100644 static void cti_pm_release(struct cti_drvdata *drvdata) { - if (drvdata->ctidev.cpu >= 0) { -- if (--nr_cti_cpu = 0) { +- if (--nr_cti_cpu == 0) { - cpu_pm_unregister_notifier(&cti_cpu_pm_nb); -+ if (drvdata->ctidev.cpu = -1) ++ if (drvdata->ctidev.cpu == -1) + return; - cpuhp_remove_state_nocalls( @@ -80,7 +80,7 @@ index 40387d58c8e7..d2da5bf9f552 100644 - } - cti_cpu_drvdata[drvdata->ctidev.cpu] = NULL; + cti_cpu_drvdata[drvdata->ctidev.cpu] = drvdata; -+ if (--nr_cti_cpu = 0) { ++ if (--nr_cti_cpu == 0) { + cpu_pm_unregister_notifier(&cti_cpu_pm_nb); + cpuhp_remove_state_nocalls(CPUHP_AP_ARM_CORESIGHT_CTI_STARTING); } @@ -183,3 +183,9 @@ index 40387d58c8e7..d2da5bf9f552 100644 } -- 2.27.0 + + +_______________________________________________ +linux-arm-kernel mailing list +linux-arm-kernel@lists.infradead.org +http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/a/content_digest b/N1/content_digest index 1259339..313c7a2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020200612121047.GF4282@kadam\0" "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[PATCH] coresight: cti: Fix error handling in probe\0" - "Date\0Fri, 12 Jun 2020 12:11:33 +0000\0" + "Date\0Fri, 12 Jun 2020 15:11:33 +0300\0" "To\0Mike Leach <mike.leach@linaro.org>\0" "Cc\0Mathieu Poirier <mathieu.poirier@linaro.org>" Suzuki K Poulose <suzuki.poulose@arm.com> @@ -50,7 +50,7 @@ "+{\n" "+\tint ret;\n" "+\n" - "+\tif (drvdata->ctidev.cpu = -1)\n" + "+\tif (drvdata->ctidev.cpu == -1)\n" "+\t\treturn 0;\n" "+\n" "+\tif (nr_cti_cpu)\n" @@ -84,9 +84,9 @@ " static void cti_pm_release(struct cti_drvdata *drvdata)\n" " {\n" "-\tif (drvdata->ctidev.cpu >= 0) {\n" - "-\t\tif (--nr_cti_cpu = 0) {\n" + "-\t\tif (--nr_cti_cpu == 0) {\n" "-\t\t\tcpu_pm_unregister_notifier(&cti_cpu_pm_nb);\n" - "+\tif (drvdata->ctidev.cpu = -1)\n" + "+\tif (drvdata->ctidev.cpu == -1)\n" "+\t\treturn;\n" " \n" "-\t\t\tcpuhp_remove_state_nocalls(\n" @@ -94,7 +94,7 @@ "-\t\t}\n" "-\t\tcti_cpu_drvdata[drvdata->ctidev.cpu] = NULL;\n" "+\tcti_cpu_drvdata[drvdata->ctidev.cpu] = drvdata;\n" - "+\tif (--nr_cti_cpu = 0) {\n" + "+\tif (--nr_cti_cpu == 0) {\n" "+\t\tcpu_pm_unregister_notifier(&cti_cpu_pm_nb);\n" "+\t\tcpuhp_remove_state_nocalls(CPUHP_AP_ARM_CORESIGHT_CTI_STARTING);\n" " \t}\n" @@ -196,6 +196,12 @@ " \treturn ret;\n" " }\n" "-- \n" - 2.27.0 + "2.27.0\n" + "\n" + "\n" + "_______________________________________________\n" + "linux-arm-kernel mailing list\n" + "linux-arm-kernel@lists.infradead.org\n" + http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -251101e68b17c9d61671fc2b7bd522e0a380f0d575ebdc250547df82675e06e9 +686d46cea87cfd00b4c2d5bb4d3eb7d5e15425fec6cd22ee672134ce213f4241
diff --git a/a/1.txt b/N2/1.txt index 8a29dfb..e1c8bbb 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -36,7 +36,7 @@ index 40387d58c8e7..d2da5bf9f552 100644 +{ + int ret; + -+ if (drvdata->ctidev.cpu = -1) ++ if (drvdata->ctidev.cpu == -1) + return 0; + + if (nr_cti_cpu) @@ -70,9 +70,9 @@ index 40387d58c8e7..d2da5bf9f552 100644 static void cti_pm_release(struct cti_drvdata *drvdata) { - if (drvdata->ctidev.cpu >= 0) { -- if (--nr_cti_cpu = 0) { +- if (--nr_cti_cpu == 0) { - cpu_pm_unregister_notifier(&cti_cpu_pm_nb); -+ if (drvdata->ctidev.cpu = -1) ++ if (drvdata->ctidev.cpu == -1) + return; - cpuhp_remove_state_nocalls( @@ -80,7 +80,7 @@ index 40387d58c8e7..d2da5bf9f552 100644 - } - cti_cpu_drvdata[drvdata->ctidev.cpu] = NULL; + cti_cpu_drvdata[drvdata->ctidev.cpu] = drvdata; -+ if (--nr_cti_cpu = 0) { ++ if (--nr_cti_cpu == 0) { + cpu_pm_unregister_notifier(&cti_cpu_pm_nb); + cpuhp_remove_state_nocalls(CPUHP_AP_ARM_CORESIGHT_CTI_STARTING); } diff --git a/a/content_digest b/N2/content_digest index 1259339..be73b61 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,15 +1,15 @@ "ref\020200612121047.GF4282@kadam\0" "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[PATCH] coresight: cti: Fix error handling in probe\0" - "Date\0Fri, 12 Jun 2020 12:11:33 +0000\0" + "Date\0Fri, 12 Jun 2020 15:11:33 +0300\0" "To\0Mike Leach <mike.leach@linaro.org>\0" "Cc\0Mathieu Poirier <mathieu.poirier@linaro.org>" Suzuki K Poulose <suzuki.poulose@arm.com> Alexander Shishkin <alexander.shishkin@linux.intel.com> Greg Kroah-Hartman <gregkh@linuxfoundation.org> - kernel-janitors@vger.kernel.org + linux-arm-kernel@lists.infradead.org linux-kernel@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" + " kernel-janitors@vger.kernel.org\0" "\00:1\0" "b\0" "There were a couple problems with error handling in the probe function:\n" @@ -50,7 +50,7 @@ "+{\n" "+\tint ret;\n" "+\n" - "+\tif (drvdata->ctidev.cpu = -1)\n" + "+\tif (drvdata->ctidev.cpu == -1)\n" "+\t\treturn 0;\n" "+\n" "+\tif (nr_cti_cpu)\n" @@ -84,9 +84,9 @@ " static void cti_pm_release(struct cti_drvdata *drvdata)\n" " {\n" "-\tif (drvdata->ctidev.cpu >= 0) {\n" - "-\t\tif (--nr_cti_cpu = 0) {\n" + "-\t\tif (--nr_cti_cpu == 0) {\n" "-\t\t\tcpu_pm_unregister_notifier(&cti_cpu_pm_nb);\n" - "+\tif (drvdata->ctidev.cpu = -1)\n" + "+\tif (drvdata->ctidev.cpu == -1)\n" "+\t\treturn;\n" " \n" "-\t\t\tcpuhp_remove_state_nocalls(\n" @@ -94,7 +94,7 @@ "-\t\t}\n" "-\t\tcti_cpu_drvdata[drvdata->ctidev.cpu] = NULL;\n" "+\tcti_cpu_drvdata[drvdata->ctidev.cpu] = drvdata;\n" - "+\tif (--nr_cti_cpu = 0) {\n" + "+\tif (--nr_cti_cpu == 0) {\n" "+\t\tcpu_pm_unregister_notifier(&cti_cpu_pm_nb);\n" "+\t\tcpuhp_remove_state_nocalls(CPUHP_AP_ARM_CORESIGHT_CTI_STARTING);\n" " \t}\n" @@ -198,4 +198,4 @@ "-- \n" 2.27.0 -251101e68b17c9d61671fc2b7bd522e0a380f0d575ebdc250547df82675e06e9 +003159cdd18c27935ef89cef259860f4adcb1205f78dac117ebfa828417846d6
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.