Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea7be66c authored by Mark M. Hoffman's avatar Mark M. Hoffman
Browse files

hwmon: (w83627ehf) read fan_div values during probe 



This patch forces the driver to read the fan divider values during early init.
Otherwise, a call to store_fan_min() could access uninitialized variables.

Signed-off-by: default avatarMark M. Hoffman <mhoffman@lightlink.com>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
parent 393cdad6

drivers/hwmon/w83627ehf.c

+29 −19
Original line number Diff line number Diff line
@@ -421,17 +421,10 @@ static void w83627ehf_write_fan_div(struct w83627ehf_data *data, int nr) 
	}

}



static struct w83627ehf_data *w83627ehf_update_device(struct device *dev)

static void w83627ehf_update_fan_div(struct w83627ehf_data *data)

{

	struct w83627ehf_data *data = dev_get_drvdata(dev);

	int pwmcfg = 0, tolerance = 0; /* shut up the compiler */

	int i;



	mutex_lock(&data->update_lock);



	if (time_after(jiffies, data->last_updated + HZ + HZ/2)

	 || !data->valid) {

		/* Fan clock dividers */

	i = w83627ehf_read_value(data, W83627EHF_REG_FANDIV1);

	data->fan_div[0] = (i >> 4) & 0x03;

	data->fan_div[1] = (i >> 6) & 0x03;
@@ -451,6 +444,20 @@ static struct w83627ehf_data *w83627ehf_update_device(struct device *dev) 
		i = w83627ehf_read_value(data, W83627EHF_REG_SMI_OVT);

		data->fan_div[3] |= (i >> 5) & 0x04;

	}

}



static struct w83627ehf_data *w83627ehf_update_device(struct device *dev)

{

	struct w83627ehf_data *data = dev_get_drvdata(dev);

	int pwmcfg = 0, tolerance = 0; /* shut up the compiler */

	int i;



	mutex_lock(&data->update_lock);



	if (time_after(jiffies, data->last_updated + HZ + HZ/2)

	 || !data->valid) {

		/* Fan clock dividers */

		w83627ehf_update_fan_div(data);



		/* Measured voltages and limits */

		for (i = 0; i < data->in_num; i++) {
@@ -1312,6 +1319,9 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev) 
	if (!(i & (1 << 1)) && (!fan5pin))

		data->has_fan |= (1 << 4);



	/* Read fan clock dividers immediately */

	w83627ehf_update_fan_div(data);



	/* Register sysfs hooks */

  	for (i = 0; i < ARRAY_SIZE(sda_sf3_arrays); i++)

		if ((err = device_create_file(dev,