summaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2013-10-11 07:01:00 -0700
committerJohan Hedberg <johan.hedberg@intel.com>2013-10-11 16:59:51 +0200
commit7648d28f28f6a661b660948b34c6ea15e163b772 (patch)
treee49147a5e6ddb8243c71ca2f52dbb430d201e05c /drivers/bluetooth
parent2e1745583581500097a1a61dfb4e42b83f1a2c45 (diff)
downloadlinux-7648d28f28f6a661b660948b34c6ea15e163b772.tar.gz
linux-7648d28f28f6a661b660948b34c6ea15e163b772.tar.bz2
linux-7648d28f28f6a661b660948b34c6ea15e163b772.zip
Bluetooth: Remove pointless parameter check in btmrvl_send_frame()
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>
Diffstat (limited to 'drivers/bluetooth')
-rw-r--r--drivers/bluetooth/btmrvl_main.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c
index 547a447149d3..5cf31c4fe6d1 100644
--- a/drivers/bluetooth/btmrvl_main.c
+++ b/drivers/bluetooth/btmrvl_main.c
@@ -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,