Merge branch 'fix/core' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-core

This commit is contained in:
Mark Brown 2015-06-10 11:09:28 +01:00
commit 96dc589624

View File

@ -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) {