diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-23 13:04:01 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-23 13:04:01 -0700 |
commit | 562b4b632c9639cc36e09b2dec32c6b3ca65ca03 (patch) | |
tree | a512d0ee87f92941b5f7de641a44c293441812e3 | |
parent | b7e113dc9d52c4a37d2da6fafe77959f3a28eccf (diff) | |
parent | ed2ba977d43a6031f78f9e49d739ef5094f512e4 (diff) | |
download | op-kernel-dev-562b4b632c9639cc36e09b2dec32c6b3ca65ca03.zip op-kernel-dev-562b4b632c9639cc36e09b2dec32c6b3ca65ca03.tar.gz |
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6:
[PATCH] missing null termination in power supply uevent
-rw-r--r-- | drivers/power/power_supply_sysfs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c index c7c4574..de3155b 100644 --- a/drivers/power/power_supply_sysfs.c +++ b/drivers/power/power_supply_sysfs.c @@ -289,6 +289,7 @@ int power_supply_uevent(struct device *dev, char **envp, int num_envp, if (ret) goto out; } + envp[i] = NULL; out: free_page((unsigned long)prop_buf); |