diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2008-09-28 08:43:59 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2008-09-28 08:43:59 +0200 |
| commit | d8a39c12b8efdf9ac2ca5c50e780a522df165780 (patch) | |
| tree | 4be0735c0bd591f435ee46048ece50767a931bc5 | |
| parent | 874471cdce5c6ce216d8657cc4b78ac8bc5911b5 (diff) | |
| parent | cccde44377fc5bb5d9db51ca6b4fcb790c7d24ba (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/bluetooth/bluez
| -rw-r--r-- | src/dbus-hci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dbus-hci.c b/src/dbus-hci.c index 795df0a3..eea166e7 100644 --- a/src/dbus-hci.c +++ b/src/dbus-hci.c @@ -518,7 +518,7 @@ void hcid_dbus_bonding_process_complete(bdaddr_t *local, bdaddr_t *peer, bonding = adapter_get_bonding_info(adapter); - if (bacmp(&bonding->bdaddr, peer)) + if (bonding && bacmp(&bonding->bdaddr, peer)) bonding = NULL; if (status == 0) { |