FindDevice and RemoveDevice should fail for devices that haven't still been fully created

1 files changed, 10 insertions, 0 deletions

diff --git a/hcid/adapter.c b/hcid/adapter.c
index 94eaa25a..59eceafd 100644
--- a/hcid/adapter.c
+++ b/hcid/adapter.c
@@ -3964,6 +3964,11 @@ static DBusMessage *remove_device(DBusConnection *conn,
 				"Device does not exist");
 	device = l->data;
 
+	if (device->temporary)
+		return g_dbus_create_error(msg,
+				ERROR_INTERFACE ".DoesNotExist",
+				"Device creation in progress");
+
 	adapter_remove_device(conn, adapter, device);
 
 	return dbus_message_new_method_return(msg);
@@ -3991,6 +3996,11 @@ static DBusMessage *find_device(DBusConnection *conn,
 
 	device = l->data;
 
+	if (device->temporary)
+		return g_dbus_create_error(msg,
+				ERROR_INTERFACE ".DoesNotExist",
+				"Device creation in progress");
+
 	reply = dbus_message_new_method_return(msg);
 	if (!reply)
 		return NULL;