]> git.hungrycats.org Git - linux/commitdiff
drivers/i2c/busses: use correct type for dma_map/unmap
authorWolfram Sang <wsa@the-dreams.de>
Mon, 21 Jul 2014 09:42:03 +0000 (11:42 +0200)
committerJiri Slaby <jslaby@suse.cz>
Wed, 3 Sep 2014 19:31:24 +0000 (21:31 +0200)
commit 28772ac8711e4d7268c06e765887dd8cb6924f98 upstream.

dma_{un}map_* uses 'enum dma_data_direction' not 'enum dma_transfer_direction'.

Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
drivers/i2c/busses/i2c-at91.c

index fd059308affa2985e64142756c9176f356f0d744..9d3e846e013744b49bb9fe4745d0b1bbd18704db 100644 (file)
@@ -210,7 +210,7 @@ static void at91_twi_write_data_dma_callback(void *data)
        struct at91_twi_dev *dev = (struct at91_twi_dev *)data;
 
        dma_unmap_single(dev->dev, sg_dma_address(&dev->dma.sg),
-                        dev->buf_len, DMA_MEM_TO_DEV);
+                        dev->buf_len, DMA_TO_DEVICE);
 
        at91_twi_write(dev, AT91_TWI_CR, AT91_TWI_STOP);
 }
@@ -289,7 +289,7 @@ static void at91_twi_read_data_dma_callback(void *data)
        struct at91_twi_dev *dev = (struct at91_twi_dev *)data;
 
        dma_unmap_single(dev->dev, sg_dma_address(&dev->dma.sg),
-                        dev->buf_len, DMA_DEV_TO_MEM);
+                        dev->buf_len, DMA_FROM_DEVICE);
 
        /* The last two bytes have to be read without using dma */
        dev->buf += dev->buf_len - 2;