Merge remote-tracking branch 'regulator/for-linus' into regulator-next

git-mirror · Nov 28, 2011 · 12f457d · 12f457d
2 parents 9ee4be4 + 58fb5cf
commit 12f457d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/drivers/regulator/core.c b/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);