Commit 849bf20e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.infradead.org/users/cbou/battery-2.6.26 

* git://git.infradead.org/users/cbou/battery-2.6.26:
  power_supply: Fix race in power_supply_uevent
parents d5301a0e 56fa18e8

drivers/power/power_supply_sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env) 


	dev_dbg(dev, "uevent\n");



	if (!psy) {

	if (!psy || !psy->dev) {

		dev_dbg(dev, "No power supply yet\n");

		return ret;

	}