summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-08-19 08:52:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-08-19 08:52:17 -0700
commit3f318b3cf87821625965344fbb30ca0fe077ef57 (patch)
tree3ba30325d047acd43c8ebfe2122593c2c5016a71 /drivers
parent952b159f2919a8d514f13999f9f463bddcc1dae7 (diff)
parent4a008c002133aba0276cbc5d116bbb774aaf1b0d (diff)
downloadlwn-3f318b3cf87821625965344fbb30ca0fe077ef57.tar.gz
lwn-3f318b3cf87821625965344fbb30ca0fe077ef57.zip
Merge tag 'hwmon-for-linus-v4.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fixes from Guenter Roeck: "Fix a bug in it87 driver and URLs in ftsteutates driver" * tag 'hwmon-for-linus-v4.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: hwmon: (ftsteutates) Correct ftp urls in driver documentation hwmon: (it87) Features mask must be 32 bit wide
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hwmon/it87.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
index 730d84028260..d0203a115eff 100644
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
@@ -491,7 +491,7 @@ struct it87_sio_data {
struct it87_data {
const struct attribute_group *groups[7];
enum chips type;
- u16 features;
+ u32 features;
u8 peci_mask;
u8 old_peci_mask;