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

1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/bluetooth/hci_ath.c b/drivers/bluetooth/hci_ath.c
index bd34406faaae..4093935ddf42 100644
--- a/drivers/bluetooth/hci_ath.c
+++ b/drivers/bluetooth/hci_ath.c
@@ -201,8 +201,13 @@ static struct sk_buff *ath_dequeue(struct hci_uart *hu)
 /* Recv data */
 static int ath_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;
 }