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/asus_atk0110.c | |
| parent | f560f6697f17e2465c8845c09f3a483faef38275 (diff) | |
| parent | d3f684f2820a7f42acef68bea6622d9032127fb2 (diff) | |
| download | linux-a406721dff91a9a5297d140dbb90327966cf9bc0.tar.gz linux-a406721dff91a9a5297d140dbb90327966cf9bc0.tar.bz2 linux-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/asus_atk0110.c')
| -rw-r--r-- | drivers/hwmon/asus_atk0110.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c index dcb78a7a8047..00e98517f94c 100644 --- a/drivers/hwmon/asus_atk0110.c +++ b/drivers/hwmon/asus_atk0110.c @@ -674,6 +674,7 @@ static int atk_debugfs_gitm_get(void *p, u64 *val) else err = -EIO; + ACPI_FREE(ret); return err; } |