greybus: arche-platform: Fix exit path in probe fn

If SVC coldboot fails or if of_platform_populate() fn fails,
then state of device needs to be reverted.

Importantly, if of_platform_populate() fails, then poweroff the SVC.

Testing Done: Tested on DB3.5 platform.

Signed-off-by: Vaibhav Hiremath <vaibhav.hiremath@linaro.org>
Reviewed-by: Michael Scott <michael.scott@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

diff --git a/drivers/staging/greybus/arche-platform.c b/drivers/staging/greybus/arche-platform.c
index efeafb373cf1600f61e6c79414312cce2866492e..c99a375bbafb9723429377434e433e088ba5636d 100644 (file)
--- a/drivers/staging/greybus/arche-platform.c
+++ b/drivers/staging/greybus/arche-platform.c
@@ -387,13 +387,13 @@ static int arche_platform_probe(struct platform_device *pdev)
        ret = arche_platform_coldboot_seq(arche_pdata);
        if (ret) {
                dev_err(dev, "Failed to cold boot svc %d\n", ret);
-               return ret;
+               goto err_coldboot;
        }
 
        ret = of_platform_populate(np, NULL, NULL, dev);
        if (ret) {
                dev_err(dev, "failed to populate child nodes %d\n", ret);
-               return ret;
+               goto err_populate;
        }
 
        INIT_DELAYED_WORK(&arche_pdata->delayed_work, svc_delayed_work);
@@ -401,6 +401,12 @@ static int arche_platform_probe(struct platform_device *pdev)
 
        dev_info(dev, "Device registered successfully\n");
        return 0;
+
+err_populate:
+       arche_platform_poweroff_seq(arche_pdata);
+err_coldboot:
+       device_remove_file(&pdev->dev, &dev_attr_state);
+       return ret;
 }
 
 static int arche_remove_child(struct device *dev, void *unused)