aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-06-22 06:19:48 -0400
committerMark Brown <broonie@kernel.org>2015-06-22 06:19:48 -0400
commit24ba1bb3ef1970169388d337203030947a928a15 (patch)
tree371c11b3c5d8e3a52df3bcf5ca90d8db34fbf32e
parent0f57d86787d8b1076ea8f9cbdddda2a46d534a27 (diff)
parenta7068e3932eee8268c4ce4e080a338ee7b8a27bf (diff)
Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
-rw-r--r--drivers/regulator/core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 443eaab933fc..53ed2d46071e 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -779,7 +779,7 @@ static int suspend_prepare(struct regulator_dev *rdev, suspend_state_t state)
779static void print_constraints(struct regulator_dev *rdev) 779static void print_constraints(struct regulator_dev *rdev)
780{ 780{
781 struct regulation_constraints *constraints = rdev->constraints; 781 struct regulation_constraints *constraints = rdev->constraints;
782 char buf[80] = ""; 782 char buf[160] = "";
783 int count = 0; 783 int count = 0;
784 int ret; 784 int ret;
785 785
@@ -801,7 +801,7 @@ static void print_constraints(struct regulator_dev *rdev)
801 } 801 }
802 802
803 if (constraints->uV_offset) 803 if (constraints->uV_offset)
804 count += sprintf(buf, "%dmV offset ", 804 count += sprintf(buf + count, "%dmV offset ",
805 constraints->uV_offset / 1000); 805 constraints->uV_offset / 1000);
806 806
807 if (constraints->min_uA && constraints->max_uA) { 807 if (constraints->min_uA && constraints->max_uA) {