Commit 7fa530ad authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman

greybus: control: do not assume a control bundle

The control bundle is going away so update the code.

Also remove defensive WARN_ON which would not just warn if our
implementation is broken, but also leak further memory unnecessarily.
Signed-off-by: default avatarJohan Hovold <johan@hovoldconsulting.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 35822c04
...@@ -22,9 +22,8 @@ int gb_control_get_manifest_size_operation(struct gb_interface *intf) ...@@ -22,9 +22,8 @@ int gb_control_get_manifest_size_operation(struct gb_interface *intf)
ret = gb_operation_sync(connection, GB_CONTROL_TYPE_GET_MANIFEST_SIZE, ret = gb_operation_sync(connection, GB_CONTROL_TYPE_GET_MANIFEST_SIZE,
NULL, 0, &response, sizeof(response)); NULL, 0, &response, sizeof(response));
if (ret) { if (ret) {
dev_err(&connection->bundle->dev, dev_err(&connection->intf->dev,
"%s: Manifest size get operation failed (%d)\n", "failed to get manifest size: %d\n", ret);
__func__, ret);
return ret; return ret;
} }
...@@ -72,7 +71,7 @@ static int gb_control_connection_init(struct gb_connection *connection) ...@@ -72,7 +71,7 @@ static int gb_control_connection_init(struct gb_connection *connection)
connection->private = control; connection->private = control;
/* Set interface's control connection */ /* Set interface's control connection */
connection->bundle->intf->control = control; connection->intf->control = control;
return 0; return 0;
} }
...@@ -81,10 +80,7 @@ static void gb_control_connection_exit(struct gb_connection *connection) ...@@ -81,10 +80,7 @@ static void gb_control_connection_exit(struct gb_connection *connection)
{ {
struct gb_control *control = connection->private; struct gb_control *control = connection->private;
if (WARN_ON(connection->bundle->intf->control != control)) connection->intf->control = NULL;
return;
connection->bundle->intf->control = NULL;
kfree(control); kfree(control);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment