greybus: pm: add error handling to bundle activation

The firmware now keeps the underlying hardware disabled until
receiving the first Bundle Activate request. Additionally: requesting
transition to a state the bundle is already in is no longer an error.

We can now add proper error handling to the bundle activate call.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

diff --git a/drivers/staging/greybus/core.c b/drivers/staging/greybus/core.c
index 8c77d6cb391938b0003cca7e20c59297960f2590..1049e9c0edb07e0922de238bd26c6c11cfa2d757 100644 (file)
--- a/drivers/staging/greybus/core.c
+++ b/drivers/staging/greybus/core.c
@@ -181,12 +181,11 @@ static int greybus_probe(struct device *dev)
                return retval;
        }
 
-       /*
-        * FIXME: We need to perform error handling on bundle activate call
-        * below when firmware is ready. We just allow the activate operation to
-        * fail for now since bundle may be in active already.
-        */
-       gb_control_bundle_activate(bundle->intf->control, bundle->id);
+       retval = gb_control_bundle_activate(bundle->intf->control, bundle->id);
+       if (retval) {
+               pm_runtime_put(&bundle->intf->dev);
+               return retval;
+       }
 
        /*
         * Unbound bundle devices are always deactivated. During probe, the