diff options
Diffstat (limited to 'drivers/regulator/tps80031-regulator.c')
| -rw-r--r-- | drivers/regulator/tps80031-regulator.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/regulator/tps80031-regulator.c b/drivers/regulator/tps80031-regulator.c index a37ede80abbf..aaab3d73d7bd 100644 --- a/drivers/regulator/tps80031-regulator.c +++ b/drivers/regulator/tps80031-regulator.c @@ -1,7 +1,7 @@ /* * tps80031-regulator.c -- TI TPS80031 regulator driver. * - * Regulator driver for TITPS80031/TPS80032 Fully Integrated Power + * Regulator driver for TI TPS80031/TPS80032 Fully Integrated Power * Management with Power Path and Battery Charger. * * Copyright (c) 2012, NVIDIA Corporation. @@ -311,7 +311,7 @@ static int tps80031_vbus_is_enabled(struct regulator_dev *rdev) TPS80031_CHARGERUSB_CTRL3, &ctrl3); if (ret < 0) { dev_err(ri->dev, "reg 0x%02x read failed, e = %d\n", - TPS80031_CHARGERUSB_CTRL1, ret); + TPS80031_CHARGERUSB_CTRL3, ret); return ret; } if ((ctrl1 & OPA_MODE_EN) && (ctrl3 & BOOST_HW_PWR_EN)) @@ -679,7 +679,6 @@ static int __devinit tps80031_regulator_probe(struct platform_device *pdev) { struct tps80031_platform_data *pdata; struct tps80031_regulator_platform_data *tps_pdata; - struct tps80031_regulator_info *rinfo; struct tps80031_regulator *ri; struct tps80031_regulator *pmic; struct regulator_dev *rdev; @@ -703,9 +702,8 @@ static int __devinit tps80031_regulator_probe(struct platform_device *pdev) for (num = 0; num < TPS80031_REGULATOR_MAX; ++num) { tps_pdata = pdata->regulator_pdata[num]; - rinfo = &tps80031_rinfo[num]; ri = &pmic[num]; - ri->rinfo = rinfo; + ri->rinfo = &tps80031_rinfo[num]; ri->dev = &pdev->dev; check_smps_mode_mult(pdev->dev.parent, ri); @@ -788,6 +786,6 @@ static void __exit tps80031_regulator_exit(void) module_exit(tps80031_regulator_exit); MODULE_ALIAS("platform:tps80031-regulator"); -MODULE_DESCRIPTION("Regulator Driver for TI TPS80031 PMIC"); +MODULE_DESCRIPTION("Regulator Driver for TI TPS80031/TPS80032 PMIC"); MODULE_AUTHOR("Laxman Dewangan <ldewangan@nvidia.com>"); MODULE_LICENSE("GPL v2"); |