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/staging

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
hwmon/f71882fg: Set platform drvdata to NULL later
hwmon/f71882fg: Fix a typo in a comment

Linus Torvalds c9a816c0 0e5b88cd

+2 -2
+2 -2
drivers/hwmon/f71882fg.c
··· 37 37 #define SIO_F71858FG_LD_HWM 0x02 /* Hardware monitor logical device */ 38 38 #define SIO_F71882FG_LD_HWM 0x04 /* Hardware monitor logical device */ 39 39 #define SIO_UNLOCK_KEY 0x87 /* Key to enable Super-I/O */ 40 - #define SIO_LOCK_KEY 0xAA /* Key to diasble Super-I/O */ 40 + #define SIO_LOCK_KEY 0xAA /* Key to disable Super-I/O */ 41 41 42 42 #define SIO_REG_LDSEL 0x07 /* Logical device select */ 43 43 #define SIO_REG_DEVID 0x20 /* Device ID (2 bytes) */ ··· 2111 2111 int nr_fans = (data->type == f71882fg) ? 4 : 3; 2112 2112 u8 start_reg = f71882fg_read8(data, F71882FG_REG_START); 2113 2113 2114 - platform_set_drvdata(pdev, NULL); 2115 2114 if (data->hwmon_dev) 2116 2115 hwmon_device_unregister(data->hwmon_dev); 2117 2116 ··· 2177 2178 } 2178 2179 } 2179 2180 2181 + platform_set_drvdata(pdev, NULL); 2180 2182 kfree(data); 2181 2183 2182 2184 return 0;