Merge remote-tracking branch 'regulator/fix/palmas' into regulator-linus

[karo-tx-linux.git] / drivers / pwm / pwm-mxs.c

diff --git a/drivers/pwm/pwm-mxs.c b/drivers/pwm/pwm-mxs.c
index 2c77b81da7c4a7fb50c70f94904ad5312a791a85..c2c5a4fd1b96bb4eede5bdd553911e3da66dee5e 100644 (file)
--- a/drivers/pwm/pwm-mxs.c
+++ b/drivers/pwm/pwm-mxs.c
@@ -161,9 +161,15 @@ static int mxs_pwm_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, mxs);
 
-       stmp_reset_block(mxs->base);
+       ret = stmp_reset_block(mxs->base);
+       if (ret)
+               goto pwm_remove;
 
        return 0;
+
+pwm_remove:
+       pwmchip_remove(&mxs->chip);
+       return ret;
 }
 
 static int mxs_pwm_remove(struct platform_device *pdev)