diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-28 22:14:35 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-28 22:14:35 -0500 |
| commit | 1433d0905f98584abe74c219869d138304b3c9e1 (patch) | |
| tree | be9a815b9e03a18e81c182f12b5c95526e490307 /drivers/regulator | |
| parent | 3c3a6aae5d09f7177ff781e6a7c6d53cbbe1d146 (diff) | |
| parent | d4cbca9ef822e05d4b55e7d0f1cdfded7a472a56 (diff) | |
Merge remote-tracking branch 'regulator/fix/tps80031' into tmp
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/tps80031-regulator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/tps80031-regulator.c b/drivers/regulator/tps80031-regulator.c index b15d711bc8c6..9019d0e7ecb6 100644 --- a/drivers/regulator/tps80031-regulator.c +++ b/drivers/regulator/tps80031-regulator.c | |||
| @@ -728,7 +728,7 @@ static int tps80031_regulator_probe(struct platform_device *pdev) | |||
| 728 | } | 728 | } |
| 729 | } | 729 | } |
| 730 | rdev = regulator_register(&ri->rinfo->desc, &config); | 730 | rdev = regulator_register(&ri->rinfo->desc, &config); |
| 731 | if (IS_ERR_OR_NULL(rdev)) { | 731 | if (IS_ERR(rdev)) { |
| 732 | dev_err(&pdev->dev, | 732 | dev_err(&pdev->dev, |
| 733 | "register regulator failed %s\n", | 733 | "register regulator failed %s\n", |
| 734 | ri->rinfo->desc.name); | 734 | ri->rinfo->desc.name); |