]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Bluetooth: Remove pointless parameter check in btmrvl_send_frame()
authorMarcel Holtmann <marcel@holtmann.org>
Fri, 11 Oct 2013 14:01:00 +0000 (07:01 -0700)
committerJohan Hedberg <johan.hedberg@intel.com>
Fri, 11 Oct 2013 14:59:51 +0000 (16:59 +0200)
The hdev parameter of btmrvl_send_frame() is always valid. If it were
not valid, then it would have crashed earlier in the call chain.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
drivers/bluetooth/btmrvl_main.c

index 547a447149d3e96a6668cbeb1b13a026d44b69e2..5cf31c4fe6d1cf552c9846c8fe7a79857851c9b6 100644 (file)
@@ -357,17 +357,10 @@ static void btmrvl_free_adapter(struct btmrvl_private *priv)
 
 static int btmrvl_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
 {
-       struct btmrvl_private *priv = NULL;
+       struct btmrvl_private *priv = hci_get_drvdata(hdev);
 
        BT_DBG("type=%d, len=%d", skb->pkt_type, skb->len);
 
-       if (!hdev) {
-               BT_ERR("Frame for unknown HCI device");
-               return -ENODEV;
-       }
-
-       priv = hci_get_drvdata(hdev);
-
        if (!test_bit(HCI_RUNNING, &hdev->flags)) {
                BT_ERR("Failed testing HCI_RUNING, flags=%lx", hdev->flags);
                print_hex_dump_bytes("data: ", DUMP_PREFIX_OFFSET,