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>
- 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));
ret = sdio_readsb(card->func, payload, card->ioport,
buf_block_len * blksz);
ret = sdio_readsb(card->func, payload, card->ioport,
buf_block_len * blksz);
- 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);
tmpbufsz = ALIGN_SZ(nb, BTSDIO_DMA_ALIGN);
tmpbuf = kmalloc(tmpbufsz, GFP_KERNEL);
memset(tmpbuf, 0, tmpbufsz);
/* Macros for Data Alignment : address */
#define ALIGN_ADDR(p, a) \
/* 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))