diff options
Diffstat (limited to 'drivers/regulator/mc13892-regulator.c')
| -rw-r--r-- | drivers/regulator/mc13892-regulator.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c index e8cfc99dd8f0..845aa2263b8a 100644 --- a/drivers/regulator/mc13892-regulator.c +++ b/drivers/regulator/mc13892-regulator.c | |||
| @@ -552,7 +552,7 @@ static int __devinit mc13892_regulator_probe(struct platform_device *pdev) | |||
| 552 | mc13xxx_lock(mc13892); | 552 | mc13xxx_lock(mc13892); |
| 553 | ret = mc13xxx_reg_read(mc13892, MC13892_REVISION, &val); | 553 | ret = mc13xxx_reg_read(mc13892, MC13892_REVISION, &val); |
| 554 | if (ret) | 554 | if (ret) |
| 555 | goto err_free; | 555 | goto err_unlock; |
| 556 | 556 | ||
| 557 | /* enable switch auto mode */ | 557 | /* enable switch auto mode */ |
| 558 | if ((val & 0x0000FFFF) == 0x45d0) { | 558 | if ((val & 0x0000FFFF) == 0x45d0) { |
| @@ -562,7 +562,7 @@ static int __devinit mc13892_regulator_probe(struct platform_device *pdev) | |||
| 562 | MC13892_SWITCHERS4_SW1MODE_AUTO | | 562 | MC13892_SWITCHERS4_SW1MODE_AUTO | |
| 563 | MC13892_SWITCHERS4_SW2MODE_AUTO); | 563 | MC13892_SWITCHERS4_SW2MODE_AUTO); |
| 564 | if (ret) | 564 | if (ret) |
| 565 | goto err_free; | 565 | goto err_unlock; |
| 566 | 566 | ||
| 567 | ret = mc13xxx_reg_rmw(mc13892, MC13892_SWITCHERS5, | 567 | ret = mc13xxx_reg_rmw(mc13892, MC13892_SWITCHERS5, |
| 568 | MC13892_SWITCHERS5_SW3MODE_M | | 568 | MC13892_SWITCHERS5_SW3MODE_M | |
| @@ -570,7 +570,7 @@ static int __devinit mc13892_regulator_probe(struct platform_device *pdev) | |||
| 570 | MC13892_SWITCHERS5_SW3MODE_AUTO | | 570 | MC13892_SWITCHERS5_SW3MODE_AUTO | |
| 571 | MC13892_SWITCHERS5_SW4MODE_AUTO); | 571 | MC13892_SWITCHERS5_SW4MODE_AUTO); |
| 572 | if (ret) | 572 | if (ret) |
| 573 | goto err_free; | 573 | goto err_unlock; |
| 574 | } | 574 | } |
| 575 | mc13xxx_unlock(mc13892); | 575 | mc13xxx_unlock(mc13892); |
| 576 | 576 | ||
| @@ -612,10 +612,10 @@ static int __devinit mc13892_regulator_probe(struct platform_device *pdev) | |||
| 612 | err: | 612 | err: |
| 613 | while (--i >= 0) | 613 | while (--i >= 0) |
| 614 | regulator_unregister(priv->regulators[i]); | 614 | regulator_unregister(priv->regulators[i]); |
| 615 | return ret; | ||
| 615 | 616 | ||
| 616 | err_free: | 617 | err_unlock: |
| 617 | mc13xxx_unlock(mc13892); | 618 | mc13xxx_unlock(mc13892); |
| 618 | |||
| 619 | return ret; | 619 | return ret; |
| 620 | } | 620 | } |
| 621 | 621 | ||
