Commit 2f6b3aa7 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
  regulator: max8649 - fix setting extclk_freq
  regulator: fix typo in current units
  regulator: fix device_register() error handling
parents 3c06806e 0f69c897
...@@ -700,7 +700,7 @@ static void print_constraints(struct regulator_dev *rdev) ...@@ -700,7 +700,7 @@ static void print_constraints(struct regulator_dev *rdev)
constraints->min_uA != constraints->max_uA) { constraints->min_uA != constraints->max_uA) {
ret = _regulator_get_current_limit(rdev); ret = _regulator_get_current_limit(rdev);
if (ret > 0) if (ret > 0)
count += sprintf(buf + count, "at %d uA ", ret / 1000); count += sprintf(buf + count, "at %d mA ", ret / 1000);
} }
if (constraints->valid_modes_mask & REGULATOR_MODE_FAST) if (constraints->valid_modes_mask & REGULATOR_MODE_FAST)
...@@ -2302,8 +2302,10 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc, ...@@ -2302,8 +2302,10 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
dev_set_name(&rdev->dev, "regulator.%d", dev_set_name(&rdev->dev, "regulator.%d",
atomic_inc_return(&regulator_no) - 1); atomic_inc_return(&regulator_no) - 1);
ret = device_register(&rdev->dev); ret = device_register(&rdev->dev);
if (ret != 0) if (ret != 0) {
put_device(&rdev->dev);
goto clean; goto clean;
}
dev_set_drvdata(&rdev->dev, rdev); dev_set_drvdata(&rdev->dev, rdev);
......
...@@ -330,7 +330,7 @@ static int __devinit max8649_regulator_probe(struct i2c_client *client, ...@@ -330,7 +330,7 @@ static int __devinit max8649_regulator_probe(struct i2c_client *client,
/* set external clock frequency */ /* set external clock frequency */
info->extclk_freq = pdata->extclk_freq; info->extclk_freq = pdata->extclk_freq;
max8649_set_bits(info->i2c, MAX8649_SYNC, MAX8649_EXT_MASK, max8649_set_bits(info->i2c, MAX8649_SYNC, MAX8649_EXT_MASK,
info->extclk_freq); info->extclk_freq << 6);
} }
if (pdata->ramp_timing) { if (pdata->ramp_timing) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment