aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBing Zhao <bzhao@marvell.com>2009-07-08 11:44:14 -0700
committerMarcel Holtmann <marcel@holtmann.org>2009-08-22 14:25:34 -0700
commit3318b2362bf0528be77123c480249663557dfbfc (patch)
treeb0d06465c9663d0f3f958c603feade942dd50e56
parent9374253ffe609f2d70dd5ae280182cb6f08fef08 (diff)
Bluetooth: Fix incorrect alignment in Marvell BT-over-SDIO driver
The driver uses "u32" for alignment check and calculation which works only on 32-bit system. It will crash the 64-bit system. Replace "u32" with "unsigned long" to fix this issue. Signed-off-by: Bing Zhao <bzhao@marvell.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r--drivers/bluetooth/btmrvl_sdio.c12
-rw-r--r--drivers/bluetooth/btmrvl_sdio.h3
2 files changed, 9 insertions, 6 deletions
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
index 224af53e0fa..1cfa8b4ace5 100644
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
@@ -481,12 +481,14 @@ static int btmrvl_sdio_card_to_host(struct btmrvl_private *priv)
goto exit;
}
- if ((u32) skb->data & (BTSDIO_DMA_ALIGN - 1)) {
- skb_put(skb, (u32) skb->data & (BTSDIO_DMA_ALIGN - 1));
- skb_pull(skb, (u32) skb->data & (BTSDIO_DMA_ALIGN - 1));
+ if ((unsigned long) skb->data & (BTSDIO_DMA_ALIGN - 1)) {
+ skb_put(skb, (unsigned long) skb->data &
+ (BTSDIO_DMA_ALIGN - 1));
+ skb_pull(skb, (unsigned long) skb->data &
+ (BTSDIO_DMA_ALIGN - 1));
}
- payload = skb->tail;
+ payload = skb->data;
ret = sdio_readsb(card->func, payload, card->ioport,
buf_block_len * blksz);
@@ -773,7 +775,7 @@ static int btmrvl_sdio_host_to_card(struct btmrvl_private *priv,
}
buf = payload;
- if ((u32) payload & (BTSDIO_DMA_ALIGN - 1)) {
+ if ((unsigned long) payload & (BTSDIO_DMA_ALIGN - 1)) {
tmpbufsz = ALIGN_SZ(nb, BTSDIO_DMA_ALIGN);
tmpbuf = kmalloc(tmpbufsz, GFP_KERNEL);
memset(tmpbuf, 0, tmpbufsz);
diff --git a/drivers/bluetooth/btmrvl_sdio.h b/drivers/bluetooth/btmrvl_sdio.h
index 2dd284e0df1..27329f107e5 100644
--- a/drivers/bluetooth/btmrvl_sdio.h
+++ b/drivers/bluetooth/btmrvl_sdio.h
@@ -104,4 +104,5 @@ struct btmrvl_sdio_device {
/* Macros for Data Alignment : address */
#define ALIGN_ADDR(p, a) \
- ((((u32)(p)) + (((u32)(a)) - 1)) & ~(((u32)(a)) - 1))
+ ((((unsigned long)(p)) + (((unsigned long)(a)) - 1)) & \
+ ~(((unsigned long)(a)) - 1))