tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 825118d1 b20a4e94

+4 -1
+2
drivers/hwmon/asus_atk0110.c
··· 348 348 return 0; 349 349 } 350 350 351 + #ifdef DEBUG 351 352 static char const *atk_sensor_type(union acpi_object *flags) 352 353 { 353 354 u64 type = flags->integer.value & ATK_TYPE_MASK; ··· 371 370 372 371 return what; 373 372 } 373 + #endif 374 374 375 375 static void atk_print_sensor(struct atk_data *data, union acpi_object *obj) 376 376 {
+2 -1
drivers/hwmon/w83781d.c
··· 1462 1462 data->pwm[i] = 1463 1463 w83781d_read_value(data, 1464 1464 W83781D_REG_PWM[i]); 1465 - if ((data->type != w83782d || !client->driver) 1465 + /* Only W83782D on SMBus has PWM3 and PWM4 */ 1466 + if ((data->type != w83782d || !client) 1466 1467 && i == 1) 1467 1468 break; 1468 1469 }