Pali Rohár
2014-10-19 14:46:54 UTC
On some machines some temperature sensors report too high values which =
are
invalid. When value is invalid function i8k_get_temp() returns previous
value and at next call it returns I8K_MAX_TEMP.
With this patch also firt i8k_get_temp() call returns I8K_MAX_TEMP and
i8k_init_hwmon() will ignore all sensor ids which report incorrect valu=
es.
Signed-off-by: Pali Roh=C3=A1r <***@gmail.com>
---
drivers/char/i8k.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
index 7272b08..bc327fa 100644
--- a/drivers/char/i8k.c
+++ b/drivers/char/i8k.c
@@ -298,7 +298,7 @@ static int i8k_get_temp(int sensor)
int temp;
=20
#ifdef I8K_TEMPERATURE_BUG
- static int prev[4];
+ static int prev[4] =3D { I8K_MAX_TEMP, I8K_MAX_TEMP, I8K_MAX_TEMP, I8=
K_MAX_TEMP };
#endif
regs.ebx =3D sensor & 0xff;
rc =3D i8k_smm(®s);
@@ -610,17 +610,17 @@ static int __init i8k_init_hwmon(void)
=20
/* CPU temperature attributes, if temperature reading is OK */
err =3D i8k_get_temp(0);
- if (err >=3D 0)
+ if (err >=3D 0 && err < I8K_MAX_TEMP)
i8k_hwmon_flags |=3D I8K_HWMON_HAVE_TEMP1;
/* check for additional temperature sensors */
err =3D i8k_get_temp(1);
- if (err >=3D 0)
+ if (err >=3D 0 && err < I8K_MAX_TEMP)
i8k_hwmon_flags |=3D I8K_HWMON_HAVE_TEMP2;
err =3D i8k_get_temp(2);
- if (err >=3D 0)
+ if (err >=3D 0 && err < I8K_MAX_TEMP)
i8k_hwmon_flags |=3D I8K_HWMON_HAVE_TEMP3;
err =3D i8k_get_temp(3);
- if (err >=3D 0)
+ if (err >=3D 0 && err < I8K_MAX_TEMP)
i8k_hwmon_flags |=3D I8K_HWMON_HAVE_TEMP4;
=20
/* Left fan attributes, if left fan is present */
--=20
1.7.9.5
are
invalid. When value is invalid function i8k_get_temp() returns previous
value and at next call it returns I8K_MAX_TEMP.
With this patch also firt i8k_get_temp() call returns I8K_MAX_TEMP and
i8k_init_hwmon() will ignore all sensor ids which report incorrect valu=
es.
Signed-off-by: Pali Roh=C3=A1r <***@gmail.com>
---
drivers/char/i8k.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
index 7272b08..bc327fa 100644
--- a/drivers/char/i8k.c
+++ b/drivers/char/i8k.c
@@ -298,7 +298,7 @@ static int i8k_get_temp(int sensor)
int temp;
=20
#ifdef I8K_TEMPERATURE_BUG
- static int prev[4];
+ static int prev[4] =3D { I8K_MAX_TEMP, I8K_MAX_TEMP, I8K_MAX_TEMP, I8=
K_MAX_TEMP };
#endif
regs.ebx =3D sensor & 0xff;
rc =3D i8k_smm(®s);
@@ -610,17 +610,17 @@ static int __init i8k_init_hwmon(void)
=20
/* CPU temperature attributes, if temperature reading is OK */
err =3D i8k_get_temp(0);
- if (err >=3D 0)
+ if (err >=3D 0 && err < I8K_MAX_TEMP)
i8k_hwmon_flags |=3D I8K_HWMON_HAVE_TEMP1;
/* check for additional temperature sensors */
err =3D i8k_get_temp(1);
- if (err >=3D 0)
+ if (err >=3D 0 && err < I8K_MAX_TEMP)
i8k_hwmon_flags |=3D I8K_HWMON_HAVE_TEMP2;
err =3D i8k_get_temp(2);
- if (err >=3D 0)
+ if (err >=3D 0 && err < I8K_MAX_TEMP)
i8k_hwmon_flags |=3D I8K_HWMON_HAVE_TEMP3;
err =3D i8k_get_temp(3);
- if (err >=3D 0)
+ if (err >=3D 0 && err < I8K_MAX_TEMP)
i8k_hwmon_flags |=3D I8K_HWMON_HAVE_TEMP4;
=20
/* Left fan attributes, if left fan is present */
--=20
1.7.9.5