git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PCI: pcie, aer: report all error before recovery
[safe/jmp/linux-2.6]
/
drivers
/
bluetooth
/
btsdio.c
diff --git
a/drivers/bluetooth/btsdio.c
b/drivers/bluetooth/btsdio.c
index
cda6c7c
..
7e29827
100644
(file)
--- a/
drivers/bluetooth/btsdio.c
+++ b/
drivers/bluetooth/btsdio.c
@@
-37,11
+37,6
@@
#include <net/bluetooth/bluetooth.h>
#include <net/bluetooth/hci_core.h>
#include <net/bluetooth/bluetooth.h>
#include <net/bluetooth/hci_core.h>
-#ifndef CONFIG_BT_HCIBTSDIO_DEBUG
-#undef BT_DBG
-#define BT_DBG(D...)
-#endif
-
#define VERSION "0.1"
static const struct sdio_device_id btsdio_table[] = {
#define VERSION "0.1"
static const struct sdio_device_id btsdio_table[] = {
@@
-91,6
+86,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;
}