diff --git a/[refs] b/[refs] index d64912e1fe9d..36d33d58ac5b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c462e8cd57869a81223c5cad2d5a61b491634229 +refs/heads/master: 600c20f34f645adf7884277302b10601583aa7d5 diff --git a/trunk/drivers/base/bus.c b/trunk/drivers/base/bus.c index 12eec3f633b1..eb1b7fa20dce 100644 --- a/trunk/drivers/base/bus.c +++ b/trunk/drivers/base/bus.c @@ -945,8 +945,8 @@ int bus_register(struct bus_type *bus) 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; }