diff options
author | Mark Brown <broonie@kernel.org> | 2015-06-10 06:09:28 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-06-10 06:09:28 -0400 |
commit | 96dc589624954fea915c1cee90e0987ff9631386 (patch) | |
tree | c41a9d234e32fe2a5281207dee48f06d09277ecf | |
parent | ff268b56ce8c86be920e1e6a15d68b168bed66c9 (diff) | |
parent | a7068e3932eee8268c4ce4e080a338ee7b8a27bf (diff) |
Merge branch 'fix/core' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-core
-rw-r--r-- | drivers/regulator/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index f6989485c382..6b9edb525d74 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) | |||
779 | static void print_constraints(struct regulator_dev *rdev) | 779 | static 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) { |