git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Bluetooth] Fix double frees on error paths of btusb and bpa10x drivers
[pandora-kernel.git]
/
drivers
/
bluetooth
/
hci_h4.c
diff --git
a/drivers/bluetooth/hci_h4.c
b/drivers/bluetooth/hci_h4.c
index
ad62abb
..
bfbae14
100644
(file)
--- a/
drivers/bluetooth/hci_h4.c
+++ b/
drivers/bluetooth/hci_h4.c
@@
-27,7
+27,6
@@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/init.h>
-#include <linux/sched.h>
#include <linux/types.h>
#include <linux/fcntl.h>
#include <linux/interrupt.h>
#include <linux/types.h>
#include <linux/fcntl.h>
#include <linux/interrupt.h>
@@
-189,7
+188,7
@@
static int h4_recv(struct hci_uart *hu, void *data, int count)
continue;
case H4_W4_EVENT_HDR:
continue;
case H4_W4_EVENT_HDR:
- eh =
(struct hci_event_hdr *) h4->rx_skb->data
;
+ eh =
hci_event_hdr(h4->rx_skb)
;
BT_DBG("Event header: evt 0x%2.2x plen %d", eh->evt, eh->plen);
BT_DBG("Event header: evt 0x%2.2x plen %d", eh->evt, eh->plen);
@@
-197,7
+196,7
@@
static int h4_recv(struct hci_uart *hu, void *data, int count)
continue;
case H4_W4_ACL_HDR:
continue;
case H4_W4_ACL_HDR:
- ah =
(struct hci_acl_hdr *) h4->rx_skb->data
;
+ ah =
hci_acl_hdr(h4->rx_skb)
;
dlen = __le16_to_cpu(ah->dlen);
BT_DBG("ACL header: dlen %d", dlen);
dlen = __le16_to_cpu(ah->dlen);
BT_DBG("ACL header: dlen %d", dlen);
@@
-206,7
+205,7
@@
static int h4_recv(struct hci_uart *hu, void *data, int count)
continue;
case H4_W4_SCO_HDR:
continue;
case H4_W4_SCO_HDR:
- sh =
(struct hci_sco_hdr *) h4->rx_skb->data
;
+ sh =
hci_sco_hdr(h4->rx_skb)
;
BT_DBG("SCO header: dlen %d", sh->dlen);
BT_DBG("SCO header: dlen %d", sh->dlen);