diff for duplicates of <20150821084909.GD25369@mwanda> diff --git a/a/1.txt b/N1/1.txt index 0b2d1e6..6792a8f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -9,7 +9,7 @@ index 4bec1d3..7a06465 100644 --- a/drivers/thermal/imx_thermal.c +++ b/drivers/thermal/imx_thermal.c @@ -288,7 +288,7 @@ static int imx_set_trip_temp(struct thermal_zone_device *tz, int trip, - if (trip = IMX_TRIP_CRITICAL) + if (trip == IMX_TRIP_CRITICAL) return -EPERM; - if (temp > IMX_TEMP_PASSIVE) diff --git a/a/content_digest b/N1/content_digest index f7ff21f..491a9bf 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[patch] thermal: underflow bug in imx_set_trip_temp()\0" - "Date\0Fri, 21 Aug 2015 08:49:09 +0000\0" + "Date\0Fri, 21 Aug 2015 11:49:09 +0300\0" "To\0Zhang Rui <rui.zhang@intel.com>" " Sascha Hauer <s.hauer@pengutronix.de>\0" "Cc\0Eduardo Valentin <edubezval@gmail.com>" @@ -20,7 +20,7 @@ "--- a/drivers/thermal/imx_thermal.c\n" "+++ b/drivers/thermal/imx_thermal.c\n" "@@ -288,7 +288,7 @@ static int imx_set_trip_temp(struct thermal_zone_device *tz, int trip,\n" - " \tif (trip = IMX_TRIP_CRITICAL)\n" + " \tif (trip == IMX_TRIP_CRITICAL)\n" " \t\treturn -EPERM;\n" " \n" "-\tif (temp > IMX_TEMP_PASSIVE)\n" @@ -29,4 +29,4 @@ " \n" " \tdata->temp_passive = temp;" -8ab342a6ef18b12c8f19ebce1f5bb4d68a7b5ed63f524c7ee2a96fcfd5a51ce5 +aeafea99c7b3f5145ca63d2e6790b08d56a7ce2deedfd774778e532947f44f65
diff --git a/a/1.txt b/N2/1.txt index 0b2d1e6..f760473 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -17,3 +17,8 @@ index 4bec1d3..7a06465 100644 return -EINVAL; data->temp_passive = temp; + +_______________________________________________ +lm-sensors mailing list +lm-sensors@lm-sensors.org +http://lists.lm-sensors.org/mailman/listinfo/lm-sensors diff --git a/a/content_digest b/N2/content_digest index f7ff21f..983db3e 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,5 +1,5 @@ "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" - "Subject\0[patch] thermal: underflow bug in imx_set_trip_temp()\0" + "Subject\0[lm-sensors] [patch] thermal: underflow bug in imx_set_trip_temp()\0" "Date\0Fri, 21 Aug 2015 08:49:09 +0000\0" "To\0Zhang Rui <rui.zhang@intel.com>" " Sascha Hauer <s.hauer@pengutronix.de>\0" @@ -27,6 +27,11 @@ "+\tif (temp < 0 || temp > IMX_TEMP_PASSIVE)\n" " \t\treturn -EINVAL;\n" " \n" - " \tdata->temp_passive = temp;" + " \tdata->temp_passive = temp;\n" + "\n" + "_______________________________________________\n" + "lm-sensors mailing list\n" + "lm-sensors@lm-sensors.org\n" + http://lists.lm-sensors.org/mailman/listinfo/lm-sensors -8ab342a6ef18b12c8f19ebce1f5bb4d68a7b5ed63f524c7ee2a96fcfd5a51ce5 +6ee6ae3781c32ad11dcc195a86a503f461ac1f508eee810f6082fd9351f473d6
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.