summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-06-10 11:09:28 +0100
committerMark Brown <broonie@kernel.org>2015-06-10 11:09:28 +0100
commit96dc589624954fea915c1cee90e0987ff9631386 (patch)
treec41a9d234e32fe2a5281207dee48f06d09277ecf /drivers/regulator
parentff268b56ce8c86be920e1e6a15d68b168bed66c9 (diff)
parenta7068e3932eee8268c4ce4e080a338ee7b8a27bf (diff)
downloadlinux-96dc589624954fea915c1cee90e0987ff9631386.tar.bz2
Merge branch 'fix/core' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-core
Diffstat (limited to 'drivers/regulator')
-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 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)
static void print_constraints(struct regulator_dev *rdev)
{
struct regulation_constraints *constraints = rdev->constraints;
- char buf[80] = "";
+ char buf[160] = "";
int count = 0;
int ret;
@@ -801,7 +801,7 @@ static void print_constraints(struct regulator_dev *rdev)
}
if (constraints->uV_offset)
- count += sprintf(buf, "%dmV offset ",
+ count += sprintf(buf + count, "%dmV offset ",
constraints->uV_offset / 1000);
if (constraints->min_uA && constraints->max_uA) {