Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 296975
b: refs/heads/master
c: eecc5bb
h: refs/heads/master
i:
  296973: 10a9834
  296971: 1431df5
  296967: c1a6628
  296959: 615aba3
v: v3
  • Loading branch information
Joe Perches authored and Matthew Garrett committed Mar 20, 2012
1 parent ce33a53 commit 3527b30
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6e71f38bdac9e7e3d598fdfe31020cdaa18b20d5
refs/heads/master: eecc5bbc612a8b008c0ef442ac8445306fbe5277
19 changes: 8 additions & 11 deletions trunk/drivers/platform/x86/acerhdf.c
Original file line number Diff line number Diff line change
Expand Up @@ -244,12 +244,11 @@ static void acerhdf_change_fanstate(int state)
unsigned char cmd;

if (verbose)
pr_notice("fan %s\n", (state == ACERHDF_FAN_OFF) ?
"OFF" : "ON");
pr_notice("fan %s\n", state == ACERHDF_FAN_OFF ? "OFF" : "ON");

if ((state != ACERHDF_FAN_OFF) && (state != ACERHDF_FAN_AUTO)) {
pr_err("invalid fan state %d requested, setting to auto!\n",
state);
state);
state = ACERHDF_FAN_AUTO;
}

Expand All @@ -264,19 +263,18 @@ static void acerhdf_check_param(struct thermal_zone_device *thermal)
{
if (fanon > ACERHDF_MAX_FANON) {
pr_err("fanon temperature too high, set to %d\n",
ACERHDF_MAX_FANON);
ACERHDF_MAX_FANON);
fanon = ACERHDF_MAX_FANON;
}

if (kernelmode && prev_interval != interval) {
if (interval > ACERHDF_MAX_INTERVAL) {
pr_err("interval too high, set to %d\n",
ACERHDF_MAX_INTERVAL);
ACERHDF_MAX_INTERVAL);
interval = ACERHDF_MAX_INTERVAL;
}
if (verbose)
pr_notice("interval changed to: %d\n",
interval);
pr_notice("interval changed to: %d\n", interval);
thermal->polling_delay = interval*1000;
prev_interval = interval;
}
Expand Down Expand Up @@ -587,8 +585,8 @@ static int acerhdf_check_hardware(void)
}

if (!bios_cfg) {
pr_err("unknown (unsupported) BIOS version %s/%s/%s, "
"please report, aborting!\n", vendor, product, version);
pr_err("unknown (unsupported) BIOS version %s/%s/%s, please report, aborting!\n",
vendor, product, version);
return -EINVAL;
}

Expand All @@ -598,8 +596,7 @@ static int acerhdf_check_hardware(void)
*/
if (!kernelmode) {
pr_notice("Fan control off, to enable do:\n");
pr_notice("echo -n \"enabled\" > "
"/sys/class/thermal/thermal_zone0/mode\n");
pr_notice("echo -n \"enabled\" > /sys/class/thermal/thermal_zone0/mode\n");
}

return 0;
Expand Down

0 comments on commit 3527b30

Please sign in to comment.