Merge branch 'for-linville' of git://github.com/kvalo/ath

[firefly-linux-kernel-4.4.55.git] / drivers / bluetooth / btmrvl_main.c

diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c
index 1e0320af00c63be9a1fdd808e8c0301dedf7ad0a..2c4997ce248484703a1b859c5e518396fcdbfa64 100644 (file)
--- a/drivers/bluetooth/btmrvl_main.c
+++ b/drivers/bluetooth/btmrvl_main.c
@@ -59,12 +59,13 @@ bool btmrvl_check_evtpkt(struct btmrvl_private *priv, struct sk_buff *skb)
                        priv->btmrvl_dev.sendcmdflag = false;
                        priv->adapter->cmd_complete = true;
                        wake_up_interruptible(&priv->adapter->cmd_wait_q);
-               }
 
-               if (hci_opcode_ogf(opcode) == 0x3F) {
-                       BT_DBG("vendor event skipped: opcode=%#4.4x", opcode);
-                       kfree_skb(skb);
-                       return false;
+                       if (hci_opcode_ogf(opcode) == 0x3F) {
+                               BT_DBG("vendor event skipped: opcode=%#4.4x",
+                                      opcode);
+                               kfree_skb(skb);
+                               return false;
+                       }
                }
        }