diff options
| author | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-06-26 17:36:30 +0200 |
|---|---|---|
| committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-06-26 17:36:30 +0200 |
| commit | b82c29d81df0ead8b66041702d1dd88e778ab806 (patch) | |
| tree | b84f27dfe6a497c19f84e0419204c3ac600445eb /drivers/bluetooth/btmrvl_sdio.c | |
| parent | Bluetooth: Use GFP_KERNEL in mgmt events functions (diff) | |
| parent | Bluetooth: btmrvl: Do not send vendor events to bluetooth stack (diff) | |
| download | linux-b82c29d81df0ead8b66041702d1dd88e778ab806.tar.xz linux-b82c29d81df0ead8b66041702d1dd88e778ab806.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Diffstat (limited to 'drivers/bluetooth/btmrvl_sdio.c')
| -rw-r--r-- | drivers/bluetooth/btmrvl_sdio.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c index 2867499f7256..cf7588edba0d 100644 --- a/drivers/bluetooth/btmrvl_sdio.c +++ b/drivers/bluetooth/btmrvl_sdio.c @@ -565,10 +565,12 @@ static int btmrvl_sdio_card_to_host(struct btmrvl_private *priv) skb_put(skb, buf_len); skb_pull(skb, SDIO_HEADER_LEN); - if (type == HCI_EVENT_PKT) - btmrvl_check_evtpkt(priv, skb); + if (type == HCI_EVENT_PKT) { + if (btmrvl_check_evtpkt(priv, skb)) + hci_recv_frame(skb); + } else + hci_recv_frame(skb); - hci_recv_frame(skb); hdev->stat.byte_rx += buf_len; break; |