|
@@ -492,7 +492,7 @@ done:
|
|
|
static int btmrvl_sdio_card_to_host(struct btmrvl_private *priv)
|
|
|
{
|
|
|
u16 buf_len = 0;
|
|
|
- int ret, buf_block_len, blksz;
|
|
|
+ int ret, num_blocks, blksz;
|
|
|
struct sk_buff *skb = NULL;
|
|
|
u32 type;
|
|
|
u8 *payload = NULL;
|
|
@@ -514,18 +514,17 @@ static int btmrvl_sdio_card_to_host(struct btmrvl_private *priv)
|
|
|
}
|
|
|
|
|
|
blksz = SDIO_BLOCK_SIZE;
|
|
|
- buf_block_len = (buf_len + blksz - 1) / blksz;
|
|
|
+ num_blocks = (buf_len + blksz - 1) / blksz;
|
|
|
|
|
|
if (buf_len <= SDIO_HEADER_LEN
|
|
|
- || (buf_block_len * blksz) > ALLOC_BUF_SIZE) {
|
|
|
+ || (num_blocks * blksz) > ALLOC_BUF_SIZE) {
|
|
|
BT_ERR("invalid packet length: %d", buf_len);
|
|
|
ret = -EINVAL;
|
|
|
goto exit;
|
|
|
}
|
|
|
|
|
|
/* Allocate buffer */
|
|
|
- skb = bt_skb_alloc(buf_block_len * blksz + BTSDIO_DMA_ALIGN,
|
|
|
- GFP_ATOMIC);
|
|
|
+ skb = bt_skb_alloc(num_blocks * blksz + BTSDIO_DMA_ALIGN, GFP_ATOMIC);
|
|
|
if (skb == NULL) {
|
|
|
BT_ERR("No free skb");
|
|
|
goto exit;
|
|
@@ -541,7 +540,7 @@ static int btmrvl_sdio_card_to_host(struct btmrvl_private *priv)
|
|
|
payload = skb->data;
|
|
|
|
|
|
ret = sdio_readsb(card->func, payload, card->ioport,
|
|
|
- buf_block_len * blksz);
|
|
|
+ num_blocks * blksz);
|
|
|
if (ret < 0) {
|
|
|
BT_ERR("readsb failed: %d", ret);
|
|
|
ret = -EIO;
|
|
@@ -590,7 +589,7 @@ static int btmrvl_sdio_card_to_host(struct btmrvl_private *priv)
|
|
|
default:
|
|
|
BT_ERR("Unknown packet type:%d", type);
|
|
|
print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, payload,
|
|
|
- blksz * buf_block_len);
|
|
|
+ blksz * num_blocks);
|
|
|
|
|
|
kfree_skb(skb);
|
|
|
skb = NULL;
|