diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-18 09:02:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-18 09:02:58 -0700 |
| commit | a406721dff91a9a5297d140dbb90327966cf9bc0 (patch) | |
| tree | 43e9910434f91f4c94eed84d937661d4f303eba0 /drivers/hwmon/it87.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (diff) | |
| parent | hwmon: (max1111) Fix race condition causing NULL pointer exception (diff) | |
| download | linux-dev-a406721dff91a9a5297d140dbb90327966cf9bc0.tar.xz linux-dev-a406721dff91a9a5297d140dbb90327966cf9bc0.zip | |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
hwmon: (max1111) Fix race condition causing NULL pointer exception
hwmon: (it87) Fix label group removal
hwmon: (asus_atk0110) Fix memory leak
Diffstat (limited to 'drivers/hwmon/it87.c')
| -rw-r--r-- | drivers/hwmon/it87.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c index bb6405b92007..5f5247750430 100644 --- a/drivers/hwmon/it87.c +++ b/drivers/hwmon/it87.c @@ -1538,7 +1538,7 @@ static struct attribute *it87_attributes_label[] = { }; static const struct attribute_group it87_group_label = { - .attrs = it87_attributes_vid, + .attrs = it87_attributes_label, }; /* SuperIO detection - will change isa_address if a chip is found */ |