summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJike Song <albcamus@gmail.com>2010-07-15 17:43:54 +0800
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-05 13:53:35 -0700
commit600c20f34f645adf7884277302b10601583aa7d5 (patch)
treeb37760bb8e867d31240cdaf512b2ab5363bf3c86 /drivers
parentc462e8cd57869a81223c5cad2d5a61b491634229 (diff)
driver core: fix memory leak on one error path in bus_register()
Reported-by: huangweibing@gmail.com Signed-off-by: Jike Song <albcamus@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/base/bus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 12eec3f633b1..eb1b7fa20dce 100644
--- 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;
}