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: Send HCI Reset command by default on device initialization
[pandora-kernel.git]
/
drivers
/
bluetooth
/
btsdio.c
diff --git
a/drivers/bluetooth/btsdio.c
b/drivers/bluetooth/btsdio.c
index
58630cc
..
f2ada0c
100644
(file)
--- a/
drivers/bluetooth/btsdio.c
+++ b/
drivers/bluetooth/btsdio.c
@@
-91,6
+91,7
@@
static int btsdio_tx_packet(struct btsdio_data *data, struct sk_buff *skb)
err = sdio_writesb(data->func, REG_TDAT, skb->data, skb->len);
if (err < 0) {
err = sdio_writesb(data->func, REG_TDAT, skb->data, skb->len);
if (err < 0) {
+ skb_pull(skb, 4);
sdio_writeb(data->func, 0x01, REG_PC_WRT, NULL);
return err;
}
sdio_writeb(data->func, 0x01, REG_PC_WRT, NULL);
return err;
}
@@
-152,7
+153,7
@@
static int btsdio_rx_packet(struct btsdio_data *data)
err = sdio_readsb(data->func, skb->data, REG_RDAT, len - 4);
if (err < 0) {
err = sdio_readsb(data->func, skb->data, REG_RDAT, len - 4);
if (err < 0) {
- kfree(skb);
+ kfree
_skb
(skb);
return err;
}
return err;
}