A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-11 23:24:22 -04:00
Code Issues Projects Releases Packages Wiki Activity

greybus: control: do not assume a control bundle

Browse source 
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: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Johan Hovold 2015-11-25 15:59:23 +01:00 • committed by Greg Kroah-Hartman
commit 7fa530ad1b
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
drivers/staging/greybus/control.c
View file

@ -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,
NULL, 0, &response, sizeof(response));
if (ret) {
dev_err(&connection->bundle->dev,
"%s: Manifest size get operation failed (%d)\n",
__func__, ret);
dev_err(&connection->intf->dev,
"failed to get manifest size: %d\n", ret);
return ret;
}
@ -72,7 +71,7 @@ static int gb_control_connection_init(struct gb_connection *connection)
connection->private = control;
/* Set interface's control connection */
connection->bundle->intf->control = control;
connection->intf->control = control;
return 0;
}
@ -81,10 +80,7 @@ static void gb_control_connection_exit(struct gb_connection *connection)
{
struct gb_control *control = connection->private;
if (WARN_ON(connection->bundle->intf->control != control))
return;
connection->bundle->intf->control = NULL;
connection->intf->control = NULL;
kfree(control);
}