e1000: add missing length check to e1000 receive routine

[safe/jmp/linux-2.6] / drivers / spi / spi_imx.c

diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c
index 014af69..0671aee 100644 (file)
--- a/drivers/spi/spi_imx.c
+++ b/drivers/spi/spi_imx.c
@@ -186,6 +186,7 @@
 #define QUEUE_STOPPED                  (1)
 
 #define IS_DMA_ALIGNED(x)              (((u32)(x) & 0x03) == 0)
+#define DMA_ALIGNMENT                  4
 /*-------------------------------------------------------------------------*/
 
 
@@ -1482,6 +1483,7 @@ static int __init spi_imx_probe(struct platform_device *pdev)
 
        master->bus_num = pdev->id;
        master->num_chipselect = platform_info->num_chipselect;
+       master->dma_alignment = DMA_ALIGNMENT;
        master->cleanup = cleanup;
        master->setup = setup;
        master->transfer = transfer;