Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

…/git/lrg/voltage-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: regulator: fix enabling regulator issue on max8925
mariux64 · Apr 28, 2010 · 1d16b0f · 1d16b0f
2 parents 032b734 + 4b99fef
commit 1d16b0f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/drivers/regulator/max8925-regulator.c b/drivers/regulator/max8925-regulator.c
@@ -109,7 +109,7 @@ static int max8925_is_enabled(struct regulator_dev *rdev)
 	struct max8925_regulator_info *info = rdev_get_drvdata(rdev);
 	int ret;
 
-	ret = max8925_reg_read(info->i2c, info->vol_reg);
+	ret = max8925_reg_read(info->i2c, info->enable_reg);
 	if (ret < 0)
 		return ret;