Skip to content

Commit

Permalink
i8k: Make fan module parameters an unsigned
Browse files Browse the repository at this point in the history
Setting negative fan multiplier or maximal fan speed does make any sense and
can cause problems. So ensure that negative values will not be accepted.

Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Pali Rohár authored and Greg Kroah-Hartman committed Jan 25, 2015
1 parent 34ae40f commit 7f69fb0
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions drivers/char/i8k.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ static DEFINE_MUTEX(i8k_mutex);
static char bios_version[4];
static struct device *i8k_hwmon_dev;
static u32 i8k_hwmon_flags;
static int i8k_fan_mult;
static int i8k_pwm_mult;
static int i8k_fan_max = I8K_FAN_HIGH;
static uint i8k_fan_mult;
static uint i8k_pwm_mult;
static uint i8k_fan_max = I8K_FAN_HIGH;

#define I8K_HWMON_HAVE_TEMP1 (1 << 0)
#define I8K_HWMON_HAVE_TEMP2 (1 << 1)
Expand Down Expand Up @@ -95,12 +95,12 @@ static bool 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);
static uint fan_mult = I8K_FAN_MULT;
module_param(fan_mult, uint, 0);
MODULE_PARM_DESC(fan_mult, "Factor to multiply fan speed with");

static int fan_max = I8K_FAN_HIGH;
module_param(fan_max, int, 0);
static uint fan_max = I8K_FAN_HIGH;
module_param(fan_max, uint, 0);
MODULE_PARM_DESC(fan_max, "Maximum configurable fan speed");

static int i8k_open_fs(struct inode *inode, struct file *file);
Expand Down Expand Up @@ -696,8 +696,8 @@ static int __init i8k_init_hwmon(void)
}

struct i8k_config_data {
int fan_mult;
int fan_max;
uint fan_mult;
uint fan_max;
};

enum i8k_configs {
Expand Down

0 comments on commit 7f69fb0

Please sign in to comment.