Commit 825118d1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 

* 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  hwmon: (w83781d) Fix W83782D support (NULL pointer dereference)
  hwmon: (asus_atk0110) Fix compiler warning
parents b20a4e94 848ddf11

drivers/hwmon/asus_atk0110.c

+2 −0
Original line number Diff line number Diff line
@@ -348,6 +348,7 @@ static int validate_hwmon_pack(struct atk_data *data, union acpi_object *obj) 
	return 0;

}



#ifdef DEBUG

static char const *atk_sensor_type(union acpi_object *flags)

{

	u64 type = flags->integer.value & ATK_TYPE_MASK;
@@ -370,6 +371,7 @@ static char const *atk_sensor_type(union acpi_object *flags) 


	return what;

}

#endif



static void atk_print_sensor(struct atk_data *data, union acpi_object *obj)

{

drivers/hwmon/w83781d.c

+2 −1
Original line number Diff line number Diff line
@@ -1462,7 +1462,8 @@ static struct w83781d_data *w83781d_update_device(struct device *dev) 
				data->pwm[i] =

				    w83781d_read_value(data,

						       W83781D_REG_PWM[i]);

				if ((data->type != w83782d || !client->driver)

				/* Only W83782D on SMBus has PWM3 and PWM4 */

				if ((data->type != w83782d || !client)

				    && i == 1)

					break;

			}