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

[uclinux-h8/linux.git] / drivers / regulator / core.c

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 443eaab..6b9edb5 100644 (file)
--- 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) {
@@ -1192,10 +1192,10 @@ static struct regulator *create_regulator(struct regulator_dev *rdev,
                if (regulator->supply_name == NULL)
                        goto overflow_err;
 
-               err = sysfs_create_link(&rdev->dev.kobj, &dev->kobj,
+               err = sysfs_create_link_nowarn(&rdev->dev.kobj, &dev->kobj,
                                        buf);
                if (err) {
-                       rdev_warn(rdev, "could not add device link %s err %d\n",
+                       rdev_dbg(rdev, "could not add device link %s err %d\n",
                                  dev->kobj.name, err);
                        /* non-fatal */
                }