git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
base
/
bus.c
diff --git
a/drivers/base/bus.c
b/drivers/base/bus.c
index
12eec3f
..
eb1b7fa
100644
(file)
--- a/
drivers/base/bus.c
+++ b/
drivers/base/bus.c
@@
-945,8
+945,8
@@
bus_devices_fail:
bus_remove_file(bus, &bus_attr_uevent);
bus_uevent_fail:
kset_unregister(&bus->p->subsys);
- kfree(bus->p);
out:
+ kfree(bus->p);
bus->p = NULL;
return retval;
}