diff --git a/[refs] b/[refs]
index 8e511ef9947c..9bb2e6d413d3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ee4be4156b1a507f199e750ba2c13ffb6ea9b42
+refs/heads/master: 12f457dd78900dbdf9431330d0c1abc040e03dbe
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
index f489bed2d848..ca2efca00734 100644
--- a/trunk/drivers/regulator/core.c
+++ b/trunk/drivers/regulator/core.c
@@ -2856,8 +2856,8 @@ void regulator_unregister(struct regulator_dev *rdev)
 	list_del(&rdev->list);
 	if (rdev->supply)
 		regulator_put(rdev->supply);
-	device_unregister(&rdev->dev);
 	kfree(rdev->constraints);
+	device_unregister(&rdev->dev);
 	mutex_unlock(&regulator_list_mutex);
 }
 EXPORT_SYMBOL_GPL(regulator_unregister);