From 99ab4f3c292f3157fcf3be1bade262ff15764469 Mon Sep 17 00:00:00 2001
From: Jike Song <albcamus@gmail.com>
Date: Thu, 15 Jul 2010 17:43:54 +0800
Subject: [PATCH] --- yaml --- r: 205531 b: refs/heads/master c:
 600c20f34f645adf7884277302b10601583aa7d5 h: refs/heads/master i:   205529:
 4747f1848fdc823ff1b649ec611346dabdb251d9   205527:
 0f70effb9d4516dabf583455d861dbee1d680b60 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/base/bus.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;
 }