From 3c48d1135438a52cd081f48201c817fed8c20c40 Mon Sep 17 00:00:00 2001 From: Pavlin Radoslavov Date: Mon, 15 Aug 2016 17:43:30 -0700 Subject: [PATCH] Removed bogus leftover code that wasn't auto-merged properly Change-Id: I41c2869ae32f08bc170cc222f036e0bc207b81f9 --- btif/co/bta_hh_co.cc | 8 ++------ hci/src/packet_fragmenter.cc | 6 ------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/btif/co/bta_hh_co.cc b/btif/co/bta_hh_co.cc index c115c32fe..ce0dc5722 100644 --- a/btif/co/bta_hh_co.cc +++ b/btif/co/bta_hh_co.cc @@ -84,13 +84,9 @@ static int uhid_read_event(btif_hh_device_t *p_dev) struct uhid_event ev; memset(&ev, 0, sizeof(ev)); - if(!p_dev) - { - APPL_TRACE_ERROR("%s: Device not found",__func__) - return -1; - } ssize_t ret; OSI_NO_INTR(ret = read(p_dev->fd, &ev, sizeof(ev))); + if (ret == 0) { APPL_TRACE_ERROR("%s: Read HUP on uhid-cdev %s", __func__, strerror(errno)); @@ -443,7 +439,7 @@ void bta_hh_co_data(uint8_t dev_handle, uint8_t *p_rpt, uint16_t len, tBTA_HH_PR if ((p_dev->fd >= 0) && p_dev->ready_for_data) { bta_hh_co_write(p_dev->fd, p_rpt, len); }else { - APPL_TRACE_WARNING("%s: Error: fd = %d, ready %d, len = %d", __func__, p_dev->fd, + APPL_TRACE_WARNING("%s: Error: fd = %d, ready %d, len = %d", __func__, p_dev->fd, p_dev->ready_for_data, len); } } diff --git a/hci/src/packet_fragmenter.cc b/hci/src/packet_fragmenter.cc index 74f6fbf80..1c8a1459b 100644 --- a/hci/src/packet_fragmenter.cc +++ b/hci/src/packet_fragmenter.cc @@ -150,12 +150,6 @@ static void reassemble_and_dispatch(UNUSED_ATTR BT_HDR *packet) { return; } - if (acl_length < L2CAP_HEADER_SIZE) { - LOG_WARN(LOG_TAG, "%s L2CAP packet too small (%d < %d). Dropping it.", __func__, packet->len, L2CAP_HEADER_SIZE); - buffer_allocator->free(packet); - return; - } - uint16_t full_length = l2cap_length + L2CAP_HEADER_SIZE + HCI_ACL_PREAMBLE_SIZE; // Check for buffer overflow and that the full packet size + BT_HDR size is less than -- 2.11.0