lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of /home/cbou/linux-2.6

Browse Source 
Conflicts:

	drivers/power/Kconfig
	drivers/power/Makefile
This commit is contained in:
Anton Vorontsov
2008-07-30 02:05:23 +04:00
parent fece418418 6e86841d05
commit 9fec6060d9
9844 changed files with 689683 additions and 529487 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/power/power_supply_sysfs.c
View File

@@ -202,7 +202,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;
}