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://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (w83627ehf) Disable setting DC mode for pwm2, pwm3 on NCT6776F
hwmon: (sht15) fix bad error code
MAINTAINERS: Drop maintainer for MAX1668 hwmon driver
MAINTAINERS: Add hwmon entries for Wolfson
hwmon: (f71805f) Fix clamping of temperature limits

Linus Torvalds c5d2bc11 8e2a2880

+14 -13
+1 -7
MAINTAINERS
··· 4281 4281 F: drivers/video/matrox/matroxfb_* 4282 4282 F: include/linux/matroxfb.h 4283 4283 4284 - MAX1668 TEMPERATURE SENSOR DRIVER 4285 - M: "David George" <david.george@ska.ac.za> 4286 - L: lm-sensors@lm-sensors.org 4287 - S: Maintained 4288 - F: Documentation/hwmon/max1668 4289 - F: drivers/hwmon/max1668.c 4290 - 4291 4284 MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER 4292 4285 M: "Hans J. Koch" <hjk@hansjkoch.de> 4293 4286 L: lm-sensors@lm-sensors.org ··· 7364 7371 F: Documentation/hwmon/wm83?? 7365 7372 F: arch/arm/mach-s3c64xx/mach-crag6410* 7366 7373 F: drivers/leds/leds-wm83*.c 7374 + F: drivers/hwmon/wm83??-hwmon.c 7367 7375 F: drivers/input/misc/wm831x-on.c 7368 7376 F: drivers/input/touchscreen/wm831x-ts.c 7369 7377 F: drivers/input/touchscreen/wm97*.c
+5 -5
drivers/hwmon/f71805f.c
··· 283 283 284 284 static inline u8 temp_to_reg(long val) 285 285 { 286 - if (val < 0) 287 - val = 0; 288 - else if (val > 1000 * 0xff) 289 - val = 0xff; 290 - return ((val + 500) / 1000); 286 + if (val <= 0) 287 + return 0; 288 + if (val >= 1000 * 0xff) 289 + return 0xff; 290 + return (val + 500) / 1000; 291 291 } 292 292 293 293 /*
+2 -1
drivers/hwmon/sht15.c
··· 883 883 884 884 static int __devinit sht15_probe(struct platform_device *pdev) 885 885 { 886 - int ret = 0; 886 + int ret; 887 887 struct sht15_data *data = kzalloc(sizeof(*data), GFP_KERNEL); 888 888 u8 status = 0; 889 889 ··· 901 901 init_waitqueue_head(&data->wait_queue); 902 902 903 903 if (pdev->dev.platform_data == NULL) { 904 + ret = -EINVAL; 904 905 dev_err(&pdev->dev, "no platform data supplied\n"); 905 906 goto err_free_data; 906 907 }
+6
drivers/hwmon/w83627ehf.c
··· 1319 1319 { 1320 1320 struct w83627ehf_data *data = dev_get_drvdata(dev); 1321 1321 struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); 1322 + struct w83627ehf_sio_data *sio_data = dev->platform_data; 1322 1323 int nr = sensor_attr->index; 1323 1324 unsigned long val; 1324 1325 int err; ··· 1331 1330 1332 1331 if (val > 1) 1333 1332 return -EINVAL; 1333 + 1334 + /* On NCT67766F, DC mode is only supported for pwm1 */ 1335 + if (sio_data->kind == nct6776 && nr && val != 1) 1336 + return -EINVAL; 1337 + 1334 1338 mutex_lock(&data->update_lock); 1335 1339 reg = w83627ehf_read_value(data, W83627EHF_REG_PWM_ENABLE[nr]); 1336 1340 data->pwm_mode[nr] = val;