projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[cascardo/linux.git]
/
drivers
/
bluetooth
/
bfusb.c
diff --git
a/drivers/bluetooth/bfusb.c
b/drivers/bluetooth/bfusb.c
index
d3f14be
..
2a00707
100644
(file)
--- 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
if (hdr & 0x10) {
BT_ERR("%s error in block", data->hdev->name);
- if (data->reassembly)
- kfree_skb(data->reassembly);
+ kfree_skb(data->reassembly);
data->reassembly = NULL;
return -EIO;
}