summaryrefslogtreecommitdiff
path: root/host/libubertooth
diff options
context:
space:
mode:
authorDominic Spill <dominicgs@gmail.com>2016-02-06 23:04:17 +0000
committerDominic Spill <dominicgs@gmail.com>2016-02-06 23:04:17 +0000
commite828fb7ee7616d81cc696048889da88b68b036ff (patch)
treee69f9747448bd8c90dda17cb49d4af469d7115bb /host/libubertooth
parentb8920cfbbec2ce2e6535b0a41e9e37d7a4c2aef2 (diff)
Revert "Switch ubertooth-scan from rx_live to ubertooth_bulk_*"
This reverts commit b8920cfbbec2ce2e6535b0a41e9e37d7a4c2aef2.
Diffstat (limited to 'host/libubertooth')
-rw-r--r--host/libubertooth/src/ubertooth.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/host/libubertooth/src/ubertooth.c b/host/libubertooth/src/ubertooth.c
index 9b19d2c..d1a5799 100644
--- a/host/libubertooth/src/ubertooth.c
+++ b/host/libubertooth/src/ubertooth.c
@@ -271,8 +271,7 @@ int ubertooth_bulk_receive(ubertooth_t* ut, rx_callback cb, void* cb_args)
rx = (usb_pkt_rx*)(ut->full_usb_buf + PKT_LEN * i);
if(rx->pkt_type != KEEP_ALIVE) {
ringbuffer_add(ut->packets, rx);
- if(cb)
- (*cb)(ut, cb_args);
+ (*cb)(ut, cb_args);
}
if(ut->stop_ubertooth) {
if(ut->rx_xfer)