diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-26 22:46:54 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-26 22:46:54 -0800 |
| commit | 63748aa8cd20a6bfb4a8ef3be9b51bec5e38ab72 (patch) | |
| tree | 380eb052c1b93ce11535ffab7f29c4e3d02a7697 /drivers/bluetooth/bfusb.c | |
| parent | 43be63662db56de3f87cb4a86bfe062a9797be65 (diff) | |
| parent | b1fb06830dc870d862f7f80e276130c0ab84d59f (diff) | |
| download | kernel-crypto-63748aa8cd20a6bfb4a8ef3be9b51bec5e38ab72.tar.gz kernel-crypto-63748aa8cd20a6bfb4a8ef3be9b51bec5e38ab72.tar.xz kernel-crypto-63748aa8cd20a6bfb4a8ef3be9b51bec5e38ab72.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6
Diffstat (limited to 'drivers/bluetooth/bfusb.c')
| -rw-r--r-- | drivers/bluetooth/bfusb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/bluetooth/bfusb.c b/drivers/bluetooth/bfusb.c index d3f14bee0f1..2a00707aba3 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 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; } |