summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-02-09 07:45:56 +0100
committerDavid S. Miller <davem@davemloft.net>2010-02-09 07:45:56 +0100
commit44bfce5c3ec91baf8ffcd075c66711740f29a949 (patch)
treef11621b66679902ecc84434f987d50c3609f0194 /drivers
parentdrivers/net: Correct NULL test (diff)
parentBluetooth: Keep a copy of each HID device's report descriptor (diff)
downloadlinux-44bfce5c3ec91baf8ffcd075c66711740f29a949.tar.xz
linux-44bfce5c3ec91baf8ffcd075c66711740f29a949.zip
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.c1
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,
exit:
sdio_release_host(card->func);
+ kfree(tmpbuf);
return ret;
}