Merge git://git.infradead.org/battery-2.6

562b4b63 · Linus Torvalds <[email protected]> · 2007-09-23 13:04:01 -07:00

* git://git.infradead.org/battery-2.6:
  [PATCH] missing null termination in power supply uevent

Merge commit. Changes below are compared with the first parent: b7e113dc.

Changes

1 files changed · +1 −0

File	Status	Add	Del	Content
drivers/power/power_supply_sysfs.c	modified	+1	−0	View file

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);