---

yaml --- r: 312518 b: refs/heads/master c: ee3ed6e h: refs/heads/master v: v3
git-mirror · Jun 7, 2012 · 075b8b2 · 075b8b2
1 parent e6fd41b
commit 075b8b2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 985f769c89aedcae2981080051fc85b4ed035a9b
+refs/heads/master: ee3ed6effd8cc4c0cbfa35307cfc5fcec75b5e12
diff --git a/trunk/drivers/regulator/da903x.c b/trunk/drivers/regulator/da903x.c
@@ -107,6 +107,9 @@ static int da903x_set_voltage_sel(struct regulator_dev *rdev, unsigned selector)
 	struct device *da9034_dev = to_da903x_dev(rdev);
 	uint8_t val, mask;
 
+	if (rdev->desc->n_voltages == 1)
+		return -EINVAL;
+
 	val = selector << info->vol_shift;
 	mask = ((1 << info->vol_nbits) - 1)  << info->vol_shift;
 
@@ -120,6 +123,9 @@ static int da903x_get_voltage_sel(struct regulator_dev *rdev)
 	uint8_t val, mask;
 	int ret;
 
+	if (rdev->desc->n_voltages == 1)
+		return 0;
+
 	ret = da903x_read(da9034_dev, info->vol_reg, &val);
 	if (ret)
 		return ret;