summaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2013-06-05 10:16:55 +0800
committerJohn W. Linville <linville@tuxdriver.com>2013-06-13 13:32:28 -0400
commit6ea81c415574acb88faca905e1d7316057e90a5b (patch)
tree79d0bddaffd5aef3aab40e378e99dbdc2c1090e7 /drivers/bluetooth
parent178c059e7640aa8e50213400c6f3dde00189d979 (diff)
downloadop-kernel-dev-6ea81c415574acb88faca905e1d7316057e90a5b.zip
op-kernel-dev-6ea81c415574acb88faca905e1d7316057e90a5b.tar.gz
Bluetooth: btmrvl: fix error return code in btmrvl_sdio_card_to_host()
Fix to return -ENOMEM in the skb alloc error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/bluetooth')
-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 13693b7..75c2626 100644
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
@@ -554,6 +554,7 @@ static int btmrvl_sdio_card_to_host(struct btmrvl_private *priv)
skb = bt_skb_alloc(num_blocks * blksz + BTSDIO_DMA_ALIGN, GFP_ATOMIC);
if (skb == NULL) {
BT_ERR("No free skb");
+ ret = -ENOMEM;
goto exit;
}
OpenPOWER on IntegriCloud