UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

greybus: connection: fail to bind if connection init fails 

gb_connection_init() can fail and will return proper error code in that
case, but the caller is ignoring it currently.

Fix that by properly handling errors returned from gb_connection_init()
and propagating them to callers of gb_connection_bind_protocol().

Signed-off-by: Fabien Parent <fparent@baylibre.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Johan Hovold <johan@hovoldconsulting.com>
This commit is contained in:
Fabien Parent 2015-08-31 17:21:14 +05:30 committed by Johan Hovold
parent fda2381bd2
commit 50bb9ccaa0
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/staging/greybus/connection.c
View File

@ -451,19 +451,20 @@ void gb_hd_connections_exit(struct greybus_host_device *hd)
gb_connection_destroy(connection);
}
void gb_connection_bind_protocol(struct gb_connection *connection)
int gb_connection_bind_protocol(struct gb_connection *connection)
{
struct gb_protocol *protocol;
int ret;
/* If we already have a protocol bound here, just return */
if (connection->protocol)
return;
return 0;
protocol = gb_protocol_get(connection->protocol_id,
connection->major,
connection->minor);
if (!protocol)
return;
return 0;
connection->protocol = protocol;
/*
@ -472,6 +473,14 @@ void gb_connection_bind_protocol(struct gb_connection *connection)
*/
if ((!connection->bundle &&
connection->hd_cport_id == GB_SVC_CPORT_ID) ||
connection->bundle->intf->device_id != GB_DEVICE_ID_BAD)
gb_connection_init(connection);
connection->bundle->intf->device_id != GB_DEVICE_ID_BAD) {
ret = gb_connection_init(connection);
if (ret) {
gb_protocol_put(protocol);
connection->protocol = NULL;
return ret;
}
}
return 0;
}

2
drivers/staging/greybus/connection.h
View File

@ -68,6 +68,6 @@ void gb_connection_push_timestamp(struct gb_connection *connection);
int gb_connection_pop_timestamp(struct gb_connection *connection,
struct timeval *tv);
void gb_connection_bind_protocol(struct gb_connection *connection);
int gb_connection_bind_protocol(struct gb_connection *connection);
#endif /* __CONNECTION_H */