diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-26 22:46:54 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-26 22:46:54 -0800 |
| commit | 63748aa8cd20a6bfb4a8ef3be9b51bec5e38ab72 (patch) | |
| tree | 380eb052c1b93ce11535ffab7f29c4e3d02a7697 /net/bluetooth/hci_core.c | |
| parent | 43be63662db56de3f87cb4a86bfe062a9797be65 (diff) | |
| parent | b1fb06830dc870d862f7f80e276130c0ab84d59f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6
Diffstat (limited to 'net/bluetooth/hci_core.c')
| -rw-r--r-- | net/bluetooth/hci_core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index ba78cc1eb8d9..cd061510b6bd 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -1565,8 +1565,7 @@ static void hci_cmd_task(unsigned long arg) /* Send queued commands */ if (atomic_read(&hdev->cmd_cnt) && (skb = skb_dequeue(&hdev->cmd_q))) { - if (hdev->sent_cmd) - kfree_skb(hdev->sent_cmd); + kfree_skb(hdev->sent_cmd); if ((hdev->sent_cmd = skb_clone(skb, GFP_ATOMIC))) { atomic_dec(&hdev->cmd_cnt); |