diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2008-07-11 06:15:23 +0000 | 
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2008-07-11 06:15:23 +0000 | 
| commit | 04b57ca4d5f35f8ed04db2494728c73b02b412d4 (patch) | |
| tree | 4b0eaac8451bb8b13557d42d551169b9285a9aeb /hcid/adapter.c | |
| parent | 14f84d602a7584f0805c93ae9ad1bd26e2387f6d (diff) | |
Allow bonding during periodic inquiry
Diffstat (limited to 'hcid/adapter.c')
| -rw-r--r-- | hcid/adapter.c | 2 | 
1 files changed, 1 insertions, 1 deletions
diff --git a/hcid/adapter.c b/hcid/adapter.c index 5879627c..29bf51ca 100644 --- a/hcid/adapter.c +++ b/hcid/adapter.c @@ -2792,7 +2792,7 @@ static DBusMessage *create_bonding(DBusConnection *conn, DBusMessage *msg,  	str2ba(address, &bdaddr);  	/* check if there is a pending discover: requested by D-Bus/non clients */ -	if (adapter->discov_active || (adapter->pdiscov_active && !adapter->pinq_idle)) +	if (adapter->discov_active)  		return in_progress(msg, "Discover in progress");  	pending_remote_name_cancel(adapter);  | 
