diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2008-09-08 18:50:16 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2008-09-08 18:50:16 +0200 |
| commit | a83ccff765033e99113ac29d3b0b7f7e0064fb28 (patch) | |
| tree | 085e8fcf478c8e7edae2f5e6375f8f43e0ffabfe /input/manager.c | |
| parent | 8a74ae3846bc1fb887c80a355265e701f1546df6 (diff) | |
| parent | 19ce4933f3dadf3b04a2a9bd84d66d750cc010c3 (diff) | |
Merge branch 'for-upstream' of git://gitorious.org/bluez/aloks-clone
Diffstat (limited to 'input/manager.c')
| -rw-r--r-- | input/manager.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/input/manager.c b/input/manager.c index 57871a34..0656b510 100644 --- a/input/manager.c +++ b/input/manager.c @@ -170,7 +170,6 @@ static int hid_device_probe(struct btd_device *device, GSList *records) { struct btd_adapter *adapter = device_get_adapter(device); const gchar *path = device_get_path(device); - const char *destination; struct hidp_connadd_req hidp; bdaddr_t src, dst; @@ -179,9 +178,7 @@ static int hid_device_probe(struct btd_device *device, GSList *records) memset(&hidp, 0, sizeof(hidp)); adapter_get_address(adapter, &src); - destination = device_get_address(device); - - str2ba(destination, &dst); + device_get_address(device, &dst); if (load_stored(&src, &dst, &hidp) == 0) goto done; @@ -212,7 +209,6 @@ static int headset_probe(struct btd_device *device, GSList *records) sdp_record_t *record = records->data; sdp_list_t *protos; uint8_t ch; - const char *destination; bdaddr_t src, dst; DBG("path %s", path); @@ -232,9 +228,7 @@ static int headset_probe(struct btd_device *device, GSList *records) } adapter_get_address(adapter, &src); - destination = device_get_address(device); - - str2ba(destination, &dst); + device_get_address(device, &dst); return fake_input_register(connection, path, &src, &dst, HSP_HS_UUID, ch); |