]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
greybus: arche-platform: Make fw_flashing_seq() return error
authorVaibhav Hiremath <vaibhav.hiremath@linaro.org>
Tue, 24 May 2016 13:02:02 +0000 (18:32 +0530)
committerGreg Kroah-Hartman <gregkh@google.com>
Thu, 26 May 2016 05:36:45 +0000 (22:36 -0700)
Make arche_platform_fw_flashing_seq() return error value, needed
later when we add clock enable support for FW flashing.

Testing Done: Tested on EVT1.5 platform.

Signed-off-by: Vaibhav Hiremath <vaibhav.hiremath@linaro.org>
Tested-by: Michael Scott <michael.scott@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
drivers/staging/greybus/arche-platform.c

index 4af34988e197b6f2b64e95197f8a1d6079431c83..a8e36e1141fd0136f16eff1157bba08e3f15ae1c 100644 (file)
@@ -335,10 +335,10 @@ static int arche_platform_coldboot_seq(struct arche_platform_drvdata *arche_pdat
 /*
  * Requires arche_pdata->platform_state_mutex to be held
  */
-static void arche_platform_fw_flashing_seq(struct arche_platform_drvdata *arche_pdata)
+static int arche_platform_fw_flashing_seq(struct arche_platform_drvdata *arche_pdata)
 {
        if (arche_pdata->state == ARCHE_PLATFORM_STATE_FW_FLASHING)
-               return;
+               return 0;
 
        dev_info(arche_pdata->dev, "Switching to FW flashing state\n");
 
@@ -353,6 +353,7 @@ static void arche_platform_fw_flashing_seq(struct arche_platform_drvdata *arche_
 
        arche_platform_set_state(arche_pdata, ARCHE_PLATFORM_STATE_FW_FLASHING);
 
+       return 0;
 }
 
 /*
@@ -424,7 +425,9 @@ static ssize_t state_store(struct device *dev,
 
                arche_platform_poweroff_seq(arche_pdata);
 
-               arche_platform_fw_flashing_seq(arche_pdata);
+               ret = arche_platform_fw_flashing_seq(arche_pdata);
+               if (ret)
+                       goto exit;
 
                device_for_each_child(arche_pdata->dev, NULL, apb_fw_flashing_state);
        } else {