浏览代码

Merge remote-tracking branch 'regulator/fix/fixed' into regulator-linus

Mark Brown 11 年之前
父节点
当前提交
7e9e801f74
共有 1 个文件被更改,包括 3 次插入0 次删除
  1. 3 0
      drivers/regulator/core.c

+ 3 - 0
drivers/regulator/core.c

@@ -2184,6 +2184,9 @@ int regulator_list_voltage(struct regulator *regulator, unsigned selector)
 	struct regulator_ops	*ops = rdev->desc->ops;
 	int			ret;
 
+	if (rdev->desc->fixed_uV && rdev->desc->n_voltages == 1 && !selector)
+		return rdev->desc->fixed_uV;
+
 	if (!ops->list_voltage || selector >= rdev->desc->n_voltages)
 		return -EINVAL;