diff options
author | Wei Yongjun <yjwei@cn.fujitsu.com> | 2009-02-25 05:09:33 -0500 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2009-02-27 00:14:50 -0500 |
commit | b1fb06830dc870d862f7f80e276130c0ab84d59f (patch) | |
tree | 35aeb36efefcf8cbfbc43b1b1ff84c9bbc76ad56 | |
parent | 7585b97a48180f754ebdade1be94092e36bef365 (diff) |
Bluetooth: Remove some pointless conditionals before kfree_skb()
Remove some pointless conditionals before kfree_skb().
Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r-- | drivers/bluetooth/bfusb.c | 3 | ||||
-rw-r--r-- | drivers/bluetooth/hci_h4.c | 3 | ||||
-rw-r--r-- | drivers/bluetooth/hci_ll.c | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/drivers/bluetooth/bfusb.c b/drivers/bluetooth/bfusb.c index d3f14bee0f19..2a00707aba3b 100644 --- a/drivers/bluetooth/bfusb.c +++ b/drivers/bluetooth/bfusb.c | |||
@@ -257,8 +257,7 @@ static inline int bfusb_recv_block(struct bfusb_data *data, int hdr, unsigned ch | |||
257 | 257 | ||
258 | if (hdr & 0x10) { | 258 | if (hdr & 0x10) { |
259 | BT_ERR("%s error in block", data->hdev->name); | 259 | BT_ERR("%s error in block", data->hdev->name); |
260 | if (data->reassembly) | 260 | kfree_skb(data->reassembly); |
261 | kfree_skb(data->reassembly); | ||
262 | data->reassembly = NULL; | 261 | data->reassembly = NULL; |
263 | return -EIO; | 262 | return -EIO; |
264 | } | 263 | } |
diff --git a/drivers/bluetooth/hci_h4.c b/drivers/bluetooth/hci_h4.c index b0fafb055996..c0ce8134814e 100644 --- a/drivers/bluetooth/hci_h4.c +++ b/drivers/bluetooth/hci_h4.c | |||
@@ -102,8 +102,7 @@ static int h4_close(struct hci_uart *hu) | |||
102 | 102 | ||
103 | skb_queue_purge(&h4->txq); | 103 | skb_queue_purge(&h4->txq); |
104 | 104 | ||
105 | if (h4->rx_skb) | 105 | kfree_skb(h4->rx_skb); |
106 | kfree_skb(h4->rx_skb); | ||
107 | 106 | ||
108 | hu->priv = NULL; | 107 | hu->priv = NULL; |
109 | kfree(h4); | 108 | kfree(h4); |
diff --git a/drivers/bluetooth/hci_ll.c b/drivers/bluetooth/hci_ll.c index b91d45a41b2f..5c65014635be 100644 --- a/drivers/bluetooth/hci_ll.c +++ b/drivers/bluetooth/hci_ll.c | |||
@@ -163,8 +163,7 @@ static int ll_close(struct hci_uart *hu) | |||
163 | skb_queue_purge(&ll->tx_wait_q); | 163 | skb_queue_purge(&ll->tx_wait_q); |
164 | skb_queue_purge(&ll->txq); | 164 | skb_queue_purge(&ll->txq); |
165 | 165 | ||
166 | if (ll->rx_skb) | 166 | kfree_skb(ll->rx_skb); |
167 | kfree_skb(ll->rx_skb); | ||
168 | 167 | ||
169 | hu->priv = NULL; | 168 | hu->priv = NULL; |
170 | 169 | ||