From: Mark Brown Date: Wed, 23 Oct 2013 11:18:53 +0000 (+0100) Subject: Merge remote-tracking branch 'regulator/topic/max8997' into regulator-next X-Git-Tag: next-20131024~50^2~10 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5d953ba45827d383313651d8773508d9b88c4e94;hp=47a24e59489ab9783c835eff7a8dab128f78b34e;p=karo-tx-linux.git Merge remote-tracking branch 'regulator/topic/max8997' into regulator-next --- 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, if (max8997->ignore_gpiodvs_side_effect == false) return -EINVAL; - dev_warn(&rdev->dev, "MAX8997 GPIO-DVS Side Effect Warning: GPIO SET:" - " %d -> %d\n", max8997->buck125_gpioindex, tmp_idx); + dev_warn(&rdev->dev, + "MAX8997 GPIO-DVS Side Effect Warning: GPIO SET: %d -> %d\n", + max8997->buck125_gpioindex, tmp_idx); out: if (new_idx < 0 || new_val < 0)