Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/bluetooth/hci_h4.c b/drivers/bluetooth/hci_h4.c
index 7b8ad93e2c36..2fcd8b387d69 100644
--- a/drivers/bluetooth/hci_h4.c
+++ b/drivers/bluetooth/hci_h4.c
@@ -151,8 +151,13 @@ static inline int h4_check_data_len(struct h4_struct *h4, int len)
 /* Recv data */
 static int h4_recv(struct hci_uart *hu, void *data, int count)
 {
-        if (hci_recv_stream_fragment(hu->hdev, data, count) < 0)
+        int ret;
+
+        ret = hci_recv_stream_fragment(hu->hdev, data, count);
+        if (ret < 0) {
                 BT_ERR("Frame Reassembly Failed");
+                return ret;
+        }
 
         return count;
 }