diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-09 00:17:25 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-09 00:17:25 +0200 |
| commit | cdbb92b31d3c465aa96bd09f2d42c39b87b32bee (patch) | |
| tree | 370e29681529882d7e4c766a19f0612885583464 /drivers/spi/pxa2xx_spi.c | |
| parent | 2ec2b482b10a1ed3493c224f1893cddd3d33833b (diff) | |
| parent | 69849375d6b13e94d08cdc94b49b11fbab454a0e (diff) | |
Merge branch 'linus' into core/rcu
Diffstat (limited to 'drivers/spi/pxa2xx_spi.c')
| -rw-r--r-- | drivers/spi/pxa2xx_spi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c index 0e53354c1cf..d47d3636227 100644 --- a/drivers/spi/pxa2xx_spi.c +++ b/drivers/spi/pxa2xx_spi.c @@ -49,7 +49,7 @@ MODULE_ALIAS("platform:pxa2xx-spi"); #define DMA_INT_MASK (DCSR_ENDINTR | DCSR_STARTINTR | DCSR_BUSERR) #define RESET_DMA_CHANNEL (DCSR_NODESC | DMA_INT_MASK) -#define IS_DMA_ALIGNED(x) (((x) & 0x07) == 0) +#define IS_DMA_ALIGNED(x) ((((u32)(x)) & 0x07) == 0) #define MAX_DMA_LEN 8191 /* @@ -896,7 +896,7 @@ static void pump_transfers(unsigned long data) || transfer->rx_dma || transfer->tx_dma) { dev_err(&drv_data->pdev->dev, "pump_transfers: mapped transfer length " - "of %lu is greater than %d\n", + "of %u is greater than %d\n", transfer->len, MAX_DMA_LEN); message->status = -EINVAL; giveback(drv_data); |