aboutsummaryrefslogtreecommitdiff
path: root/hw/bt-hci.c
diff options
context:
space:
mode:
authorAurelien Jarno <aurelien@aurel32.net>2012-10-06 18:54:14 +0200
committerAurelien Jarno <aurelien@aurel32.net>2012-10-06 18:54:14 +0200
commit048d3612a51b3da45081091b734f93428925ebf8 (patch)
treead2b1235146f9bc5b94c1bfae02327ee3b03fa40 /hw/bt-hci.c
parent6b2f90fbbd31d594238098f46ef63ee307a12f55 (diff)
parent02cd521f6e207bd8843a7c1309f6d065cf01c6ee (diff)
downloadqemu-048d3612a51b3da45081091b734f93428925ebf8.zip
qemu-048d3612a51b3da45081091b734f93428925ebf8.tar.gz
qemu-048d3612a51b3da45081091b734f93428925ebf8.tar.bz2
Merge branch 'trivial-patches' of git://github.com/stefanha/qemu
* 'trivial-patches' of git://github.com/stefanha/qemu: versatilepb: Use symbolic indices for ARM PIC qdev: kill bogus comment qemu-barrier: Fix compiler version check for future gcc versions hw: Add missing 'static' attribute for QEMUMachine cleanup useless return sentence qemu-sockets: Fix compiler warning (regression for MinGW) vnc: Fix spelling (hellmen -> hellman) in comment slirp: Fix spelling in comment (enought -> enough, insure -> ensure) tcg/arm: Use tcg_out_mov_reg rather than inline equivalent code cpu: Add missing 'static' attribute to qemu_global_mutex configure: Support empty target list (--target-list=) hw: Fix return value check for bdrv_read, bdrv_write
Diffstat (limited to 'hw/bt-hci.c')
-rw-r--r--hw/bt-hci.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/bt-hci.c b/hw/bt-hci.c
index 47f9a4e..e54cfd7 100644
--- a/hw/bt-hci.c
+++ b/hw/bt-hci.c
@@ -786,7 +786,6 @@ static void bt_hci_lmp_connection_request(struct bt_link_s *link)
memcpy(&params.dev_class, &link->host->class, sizeof(params.dev_class));
params.link_type = ACL_LINK;
bt_hci_event(hci, EVT_CONN_REQUEST, &params, EVT_CONN_REQUEST_SIZE);
- return;
}
static void bt_hci_conn_accept_timeout(void *opaque)