Merge git://git.infradead.org/mtd-2.6

[linux-2.6-omap-h63xx.git] / drivers / regulator / da903x.c

diff --git a/drivers/regulator/da903x.c b/drivers/regulator/da903x.c
index 773b29cec8beb768b0ed576afb07a57b9695c3c4..fe77730a7edb73442b088a4e325dd70d4c2a6366 100644 (file)
--- a/drivers/regulator/da903x.c
+++ b/drivers/regulator/da903x.c
@@ -102,7 +102,7 @@ static int da903x_set_ldo_voltage(struct regulator_dev *rdev,
        uint8_t val, mask;
 
        if (check_range(info, min_uV, max_uV)) {
-               pr_err("invalid voltage range (%d, %d) uV", min_uV, max_uV);
+               pr_err("invalid voltage range (%d, %d) uV\n", min_uV, max_uV);
                return -EINVAL;
        }
 
@@ -159,7 +159,7 @@ static int da903x_is_enabled(struct regulator_dev *rdev)
        if (ret)
                return ret;
 
-       return reg_val & (1 << info->enable_bit);
+       return !!(reg_val & (1 << info->enable_bit));
 }
 
 /* DA9030 specific operations */
@@ -172,7 +172,7 @@ static int da9030_set_ldo1_15_voltage(struct regulator_dev *rdev,
        int ret;
 
        if (check_range(info, min_uV, max_uV)) {
-               pr_err("invalid voltage range (%d, %d) uV", min_uV, max_uV);
+               pr_err("invalid voltage range (%d, %d) uV\n", min_uV, max_uV);
                return -EINVAL;
        }
 
@@ -199,7 +199,7 @@ static int da9030_set_ldo14_voltage(struct regulator_dev *rdev,
        int thresh;
 
        if (check_range(info, min_uV, max_uV)) {
-               pr_err("invalid voltage range (%d, %d) uV", min_uV, max_uV);
+               pr_err("invalid voltage range (%d, %d) uV\n", min_uV, max_uV);
                return -EINVAL;
        }
 
@@ -248,7 +248,7 @@ static int da9034_set_dvc_voltage(struct regulator_dev *rdev,
        int ret;
 
        if (check_range(info, min_uV, max_uV)) {
-               pr_err("invalid voltage range (%d, %d) uV", min_uV, max_uV);
+               pr_err("invalid voltage range (%d, %d) uV\n", min_uV, max_uV);
                return -EINVAL;
        }
 
@@ -273,7 +273,7 @@ static int da9034_set_ldo12_voltage(struct regulator_dev *rdev,
        uint8_t val, mask;
 
        if (check_range(info, min_uV, max_uV)) {
-               pr_err("invalid voltage range (%d, %d) uV", min_uV, max_uV);
+               pr_err("invalid voltage range (%d, %d) uV\n", min_uV, max_uV);
                return -EINVAL;
        }