diff options
author | Johan Hovold <johan@hovoldconsulting.com> | 2016-07-20 14:40:24 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@google.com> | 2016-07-20 17:16:54 (GMT) |
commit | 12169bc9143ed24ad7a5ea12a7c28d1dba891131 (patch) | |
tree | c940d71ec18aa1fd6dcf08d48d17d15bcc5242a2 | |
parent | 62491622db9c9b6a51630f4c8c653f59c2c834f9 (diff) | |
download | linux-12169bc9143ed24ad7a5ea12a7c28d1dba891131.tar.xz |
greybus: interface: prevent reactivation during removal
Make sure to prevent an interface that is going away from being
reactivated.
This is needed to preemptively close a race between the upcoming feature
to reactivate a powered-down interface and physical removal (i.e.
module_removed event processing) as well as logical removal (e.g. the
current system-suspend hack).
Reviewed-by: Sandeep Patil <sspatil@google.com>
Signed-off-by: Johan Hovold <johan@hovoldconsulting.com>
Reviewed-by: Alex Elder <elder@linaro.org>
Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Patrick Titiano <ptitiano@baylibre.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
-rw-r--r-- | drivers/staging/greybus/interface.c | 2 | ||||
-rw-r--r-- | drivers/staging/greybus/interface.h | 1 | ||||
-rw-r--r-- | drivers/staging/greybus/module.c | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/drivers/staging/greybus/interface.c b/drivers/staging/greybus/interface.c index 01cefce..3ad1c75 100644 --- a/drivers/staging/greybus/interface.c +++ b/drivers/staging/greybus/interface.c @@ -873,7 +873,7 @@ static int _gb_interface_activate(struct gb_interface *intf, *type = GB_INTERFACE_TYPE_UNKNOWN; - if (intf->ejected) + if (intf->ejected || intf->removed) return -ENODEV; ret = gb_interface_vsys_set(intf, true); diff --git a/drivers/staging/greybus/interface.h b/drivers/staging/greybus/interface.h index f52dfd0..daa9759 100644 --- a/drivers/staging/greybus/interface.h +++ b/drivers/staging/greybus/interface.h @@ -53,6 +53,7 @@ struct gb_interface { bool disconnected; bool ejected; + bool removed; bool active; bool enabled; bool mode_switch; diff --git a/drivers/staging/greybus/module.c b/drivers/staging/greybus/module.c index d506fa0..69f67dd 100644 --- a/drivers/staging/greybus/module.c +++ b/drivers/staging/greybus/module.c @@ -186,6 +186,7 @@ static void gb_module_deregister_interface(struct gb_interface *intf) intf->disconnected = true; mutex_lock(&intf->mutex); + intf->removed = true; gb_interface_disable(intf); gb_interface_deactivate(intf); mutex_unlock(&intf->mutex); |