diff --git a/[refs] b/[refs]
index aed609912587..4e9514863a05 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a7a1ad9066e0266c8a4357ba3dbaeebfb80f531d
+refs/heads/master: 6bf87d17c9f5b855e9dde7b3d6f726385b966814
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
index e11c2222d9af..79a6910eb894 100644
--- a/trunk/drivers/regulator/core.c
+++ b/trunk/drivers/regulator/core.c
@@ -2253,6 +2253,7 @@ void regulator_unregister(struct regulator_dev *rdev)
 		return;
 
 	mutex_lock(&regulator_list_mutex);
+	WARN_ON(rdev->open_count);
 	unset_regulator_supplies(rdev);
 	list_del(&rdev->list);
 	if (rdev->supply)