2013-10-18 22:40:56

by Felipe Pena

[permalink] [raw]
Subject: [PATCH] thinkpad-acpi: Fix wrong assignment

In the thermal_init function when checking for thinkpad_id.ec_model,
the 'ta2' variable is being OR'd when acpi_ec_read call succeeds,
on fail it is setting 0 to 'ta1' variable instead.

Signed-off-by: Felipe Pena <[email protected]>
---
drivers/platform/x86/thinkpad_acpi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 03ca6c1..ac6f938 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -5730,7 +5730,7 @@ static int __init thermal_init(struct ibm_init_struct *iibm)
if (acpi_ec_read(TP_EC_THERMAL_TMP8 + i, &t)) {
ta2 |= t;
} else {
- ta1 = 0;
+ ta2 = 0;
break;
}
}
--
1.7.10.4


Subject: Re: [PATCH] thinkpad-acpi: Fix wrong assignment

On Fri, 18 Oct 2013, Felipe Pena wrote:
> In the thermal_init function when checking for thinkpad_id.ec_model,
> the 'ta2' variable is being OR'd when acpi_ec_read call succeeds,
> on fail it is setting 0 to 'ta1' variable instead.
>
> Signed-off-by: Felipe Pena <[email protected]>

NAK.

ta1 == 0 implies malfunction on the direct-from-EC temperature reading,
which is what the code wants to signal. The code is correct as is.

Do not merge this patch.

--
"One disk to rule them all, One disk to find them. One disk to bring
them all and in the darkness grind them. In the Land of Redmond
where the shadows lie." -- The Silicon Valley Tarot
Henrique Holschuh