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

12f457dd · Mark Brown · 9ee4be41 · 58fb5cf5 · 12f457dd
Commit 12f457dd authored Nov 28, 2011 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/regulator/core.c drivers/regulator/core.c +1 -1

No files found.
--- 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);