diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-24 06:11:38 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-24 06:11:38 -0400 |
| commit | 08f09c63e1b0d01ba59b43d4b7e1454c72ae72f5 (patch) | |
| tree | 6f5c34179b189f202345e212ebcb58baae12c1a0 | |
| parent | 4e31566d9b73a727b3761c025ec1943c1ff14638 (diff) | |
| parent | c4e3b1442a77e7fd7459168894f6416f00542f74 (diff) | |
Merge remote-tracking branch 'regulator/topic/max8997' into regulator-next
| -rw-r--r-- | drivers/regulator/max8997.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/regulator/max8997.c b/drivers/regulator/max8997.c index bcd2488d1252..2d618fc9c1af 100644 --- a/drivers/regulator/max8997.c +++ b/drivers/regulator/max8997.c | |||
| @@ -690,8 +690,9 @@ static int max8997_set_voltage_buck(struct regulator_dev *rdev, | |||
| 690 | if (max8997->ignore_gpiodvs_side_effect == false) | 690 | if (max8997->ignore_gpiodvs_side_effect == false) |
| 691 | return -EINVAL; | 691 | return -EINVAL; |
| 692 | 692 | ||
| 693 | dev_warn(&rdev->dev, "MAX8997 GPIO-DVS Side Effect Warning: GPIO SET:" | 693 | dev_warn(&rdev->dev, |
| 694 | " %d -> %d\n", max8997->buck125_gpioindex, tmp_idx); | 694 | "MAX8997 GPIO-DVS Side Effect Warning: GPIO SET: %d -> %d\n", |
| 695 | max8997->buck125_gpioindex, tmp_idx); | ||
| 695 | 696 | ||
| 696 | out: | 697 | out: |
| 697 | if (new_idx < 0 || new_val < 0) | 698 | if (new_idx < 0 || new_val < 0) |