diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-13 16:01:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-13 16:01:11 -0700 |
| commit | c9a816c0ecb8cef8e6573a8eab47fc48c765e0a1 (patch) | |
| tree | 977f232ca357986b6e3fdc26839092abe666b4a5 /drivers | |
| parent | 0e5b88cd9975dca6c191cc9bd11f233fac4ca882 (diff) | |
| parent | d9ebaa45472c92704f4814682eec21455edcfa1f (diff) | |
| download | linux-c9a816c0ecb8cef8e6573a8eab47fc48c765e0a1.tar.gz linux-c9a816c0ecb8cef8e6573a8eab47fc48c765e0a1.tar.bz2 linux-c9a816c0ecb8cef8e6573a8eab47fc48c765e0a1.zip | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hwmon/f71882fg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/f71882fg.c b/drivers/hwmon/f71882fg.c index 3f49dd376f02..6e06019015a5 100644 --- a/drivers/hwmon/f71882fg.c +++ b/drivers/hwmon/f71882fg.c @@ -37,7 +37,7 @@ #define SIO_F71858FG_LD_HWM 0x02 /* Hardware monitor logical device */ #define SIO_F71882FG_LD_HWM 0x04 /* Hardware monitor logical device */ #define SIO_UNLOCK_KEY 0x87 /* Key to enable Super-I/O */ -#define SIO_LOCK_KEY 0xAA /* Key to diasble Super-I/O */ +#define SIO_LOCK_KEY 0xAA /* Key to disable Super-I/O */ #define SIO_REG_LDSEL 0x07 /* Logical device select */ #define SIO_REG_DEVID 0x20 /* Device ID (2 bytes) */ @@ -2111,7 +2111,6 @@ static int f71882fg_remove(struct platform_device *pdev) int nr_fans = (data->type == f71882fg) ? 4 : 3; u8 start_reg = f71882fg_read8(data, F71882FG_REG_START); - platform_set_drvdata(pdev, NULL); if (data->hwmon_dev) hwmon_device_unregister(data->hwmon_dev); @@ -2178,6 +2177,7 @@ static int f71882fg_remove(struct platform_device *pdev) } } + platform_set_drvdata(pdev, NULL); kfree(data); return 0; |