---

yaml --- r: 312495 b: refs/heads/master c: 6333e9d h: refs/heads/master i: 312493: 8ad84f2 312491: 375d872 312487: 6b1df48 312479: e9f04db v: v3
git-mirror · Jun 3, 2012 · b5cbb1b · b5cbb1b
1 parent b249418
commit b5cbb1b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cad8d76e20eda5ccfcfbccdd711b91e053b4ab05
+refs/heads/master: 6333e9ddf4787ec42cbb4cbb482168094e54b337
diff --git a/trunk/drivers/regulator/ab8500.c b/trunk/drivers/regulator/ab8500.c
@@ -256,14 +256,7 @@ static int ab8500_regulator_set_voltage_time_sel(struct regulator_dev *rdev,
 					     unsigned int new_sel)
 {
 	struct ab8500_regulator_info *info = rdev_get_drvdata(rdev);
-	int ret;
 
-	/* If the regulator isn't on, it won't take time here */
-	ret = ab8500_regulator_is_enabled(rdev);
-	if (ret < 0)
-		return ret;
-	if (!ret)
-		return 0;
 	return info->delay;
 }