audio/A2DP: Return -ENOPROTOOPT if record doesn't exist

In case record is not registered it means no endpoint is available so
return -ENOPROTOOPT to indicate that it is currently not available.
This commit is contained in:
Luiz Augusto von Dentz 2013-11-13 15:26:36 +02:00 committed by Johan Hedberg
parent b17fdd8adb
commit 5cc87d0ab0

View File

@ -1861,10 +1861,22 @@ static void a2dp_sink_remove(struct btd_service *service)
static int a2dp_source_connect(struct btd_service *service) static int a2dp_source_connect(struct btd_service *service)
{ {
struct btd_device *dev = btd_service_get_device(service); struct btd_device *dev = btd_service_get_device(service);
struct btd_adapter *adapter = device_get_adapter(dev);
struct a2dp_server *server;
const char *path = device_get_path(dev); const char *path = device_get_path(dev);
DBG("path %s", path); DBG("path %s", path);
server = find_server(servers, adapter);
if (!server || !server->sink_enabled) {
DBG("Unexpected error: cannot find server");
return -EPROTONOSUPPORT;
}
/* Return protocol not available if no record/endpoint exists */
if (server->sink_record_id == 0)
return -ENOPROTOOPT;
return source_connect(service); return source_connect(service);
} }
@ -1881,10 +1893,22 @@ static int a2dp_source_disconnect(struct btd_service *service)
static int a2dp_sink_connect(struct btd_service *service) static int a2dp_sink_connect(struct btd_service *service)
{ {
struct btd_device *dev = btd_service_get_device(service); struct btd_device *dev = btd_service_get_device(service);
struct btd_adapter *adapter = device_get_adapter(dev);
struct a2dp_server *server;
const char *path = device_get_path(dev); const char *path = device_get_path(dev);
DBG("path %s", path); DBG("path %s", path);
server = find_server(servers, adapter);
if (!server || !server->source_enabled) {
DBG("Unexpected error: cannot find server");
return -EPROTONOSUPPORT;
}
/* Return protocol not available if no record/endpoint exists */
if (server->source_record_id == 0)
return -ENOPROTOOPT;
return sink_connect(service); return sink_connect(service);
} }