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
This commit is contained in:
commit
849bf20e73
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user