Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 95669
b: refs/heads/master
c: 4ed99a2
h: refs/heads/master
i:
  95667: 50d4c10
v: v3
  • Loading branch information
Jochen Eisinger authored and Linus Torvalds committed May 1, 2008
1 parent 50a7318 commit 59633a6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 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: af8e2a4cb9b3e14b919ae1cd4012825aefddbeb0
refs/heads/master: 4ed99a27d161ce6f1eb6657c5cd5e6aef365c665
6 changes: 5 additions & 1 deletion trunk/drivers/char/i8k.c
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ static int power_status;
module_param(power_status, bool, 0600);
MODULE_PARM_DESC(power_status, "Report power status in /proc/i8k");

static int fan_mult = I8K_FAN_MULT;
module_param(fan_mult, int, 0);
MODULE_PARM_DESC(fan_mult, "Factor to multiply fan speed with");

static int i8k_open_fs(struct inode *inode, struct file *file);
static int i8k_ioctl(struct inode *, struct file *, unsigned int,
unsigned long);
Expand Down Expand Up @@ -239,7 +243,7 @@ static int i8k_get_fan_speed(int fan)
struct smm_regs regs = { .eax = I8K_SMM_GET_SPEED, };

regs.ebx = fan & 0xff;
return i8k_smm(&regs) ? : (regs.eax & 0xffff) * I8K_FAN_MULT;
return i8k_smm(&regs) ? : (regs.eax & 0xffff) * fan_mult;
}

/*
Expand Down

0 comments on commit 59633a6

Please sign in to comment.