diff --git a/[refs] b/[refs]
index ab3c3f9471d4..edc12e1f8547 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 036de8efae4b81f8e1504fab654070cecce6dfa9
+refs/heads/master: cd78dfc6c6e321a310a73ef7b0df3d262704dd55
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
index 47fc6e6fe9bc..cb62be63caed 100644
--- a/trunk/drivers/regulator/core.c
+++ b/trunk/drivers/regulator/core.c
@@ -2001,8 +2001,8 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
 	if (regulator_desc->name == NULL || regulator_desc->ops == NULL)
 		return ERR_PTR(-EINVAL);
 
-	if (!regulator_desc->type == REGULATOR_VOLTAGE &&
-	    !regulator_desc->type == REGULATOR_CURRENT)
+	if (regulator_desc->type != REGULATOR_VOLTAGE &&
+	    regulator_desc->type != REGULATOR_CURRENT)
 		return ERR_PTR(-EINVAL);
 
 	if (!init_data)