diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-04-25 20:34:25 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-04-25 20:34:25 +0200 |
| commit | cfef6047c4027a8448ec8dafeaf2bb362cc882e4 (patch) | |
| tree | c254bd25aa8b4b0696b5b5cc45d8e30c7c1bb9dd /drivers/bluetooth/hci_h4.c | |
| parent | inet: constify ip headers and in6_addr (diff) | |
| parent | mac80211: explain padding in place of rate field (diff) | |
| download | linux-cfef6047c4027a8448ec8dafeaf2bb362cc882e4.tar.xz linux-cfef6047c4027a8448ec8dafeaf2bb362cc882e4.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/rt2x00/rt2x00queue.c
drivers/net/wireless/rt2x00/rt2x00queue.h
Diffstat (limited to 'drivers/bluetooth/hci_h4.c')
| -rw-r--r-- | drivers/bluetooth/hci_h4.c | 7 |
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; } |