diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-04-25 14:34:25 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-04-25 14:34:25 -0400 |
| commit | cfef6047c4027a8448ec8dafeaf2bb362cc882e4 (patch) | |
| tree | c254bd25aa8b4b0696b5b5cc45d8e30c7c1bb9dd /drivers/bluetooth/ath3k.c | |
| parent | b71d1d426d263b0b6cb5760322efebbfc89d4463 (diff) | |
| parent | 73b48099cc265f88fa1255f3f43e52fe6a94fd5c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/rt2x00/rt2x00queue.c
drivers/net/wireless/rt2x00/rt2x00queue.h
Diffstat (limited to 'drivers/bluetooth/ath3k.c')
| -rw-r--r-- | drivers/bluetooth/ath3k.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c index 5577ed656e2f..695d4414bd4c 100644 --- a/drivers/bluetooth/ath3k.c +++ b/drivers/bluetooth/ath3k.c | |||
| @@ -138,9 +138,6 @@ static int ath3k_load_firmware(struct usb_device *udev, | |||
| 138 | count -= size; | 138 | count -= size; |
| 139 | } | 139 | } |
| 140 | 140 | ||
| 141 | kfree(send_buf); | ||
| 142 | return 0; | ||
| 143 | |||
| 144 | error: | 141 | error: |
| 145 | kfree(send_buf); | 142 | kfree(send_buf); |
| 146 | return err; | 143 | return err; |