diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-09 01:45:56 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-09 01:45:56 -0500 |
| commit | 44bfce5c3ec91baf8ffcd075c66711740f29a949 (patch) | |
| tree | f11621b66679902ecc84434f987d50c3609f0194 /drivers | |
| parent | bcf4d812e66ee95f762b38063d654fd1ff7156b0 (diff) | |
| parent | 15c697ce1c5b408c5e20dcdc6aea2968d1125b75 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/bluetooth/btmrvl_sdio.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c index f36defa37764..57d965b7f521 100644 --- a/drivers/bluetooth/btmrvl_sdio.c +++ b/drivers/bluetooth/btmrvl_sdio.c | |||
| @@ -808,6 +808,7 @@ static int btmrvl_sdio_host_to_card(struct btmrvl_private *priv, | |||
| 808 | 808 | ||
| 809 | exit: | 809 | exit: |
| 810 | sdio_release_host(card->func); | 810 | sdio_release_host(card->func); |
| 811 | kfree(tmpbuf); | ||
| 811 | 812 | ||
| 812 | return ret; | 813 | return ret; |
| 813 | } | 814 | } |