This is a note to let you know that I've just added the patch titled tty/serial: at91: use correct type for dma_sync_*_for_cpu() and dma_sync_*_for_device() to the 3.19-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: tty-serial-at91-use-correct-type-for-dma_sync_-_for_cpu-and-dma_sync_-_for_device.patch and it can be found in the queue-3.19 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 485819b5b9ed82372dacae775998f3c33717f7fe Mon Sep 17 00:00:00 2001 From: Cyrille Pitchen <cyrille.pitchen@xxxxxxxxx> Date: Tue, 9 Dec 2014 14:31:32 +0100 Subject: tty/serial: at91: use correct type for dma_sync_*_for_cpu() and dma_sync_*_for_device() From: Cyrille Pitchen <cyrille.pitchen@xxxxxxxxx> commit 485819b5b9ed82372dacae775998f3c33717f7fe upstream. dma_sync_*_for_cpu() and dma_sync_*_for_device() use 'enum dma_data_direction', not 'enum dma_transfer_direction' Signed-off-by: Cyrille Pitchen <cyrille.pitchen@xxxxxxxxx> Acked-by: Nicolas Ferre <nicolas.ferre@xxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/tty/serial/atmel_serial.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c @@ -794,7 +794,7 @@ static void atmel_tx_dma(struct uart_por return; } - dma_sync_sg_for_device(port->dev, sg, 1, DMA_MEM_TO_DEV); + dma_sync_sg_for_device(port->dev, sg, 1, DMA_TO_DEVICE); atmel_port->desc_tx = desc; desc->callback = atmel_complete_tx_dma; @@ -927,7 +927,7 @@ static void atmel_rx_from_dma(struct uar dma_sync_sg_for_cpu(port->dev, &atmel_port->sg_rx, 1, - DMA_DEV_TO_MEM); + DMA_FROM_DEVICE); /* * ring->head points to the end of data already written by the DMA. @@ -974,7 +974,7 @@ static void atmel_rx_from_dma(struct uar dma_sync_sg_for_device(port->dev, &atmel_port->sg_rx, 1, - DMA_DEV_TO_MEM); + DMA_FROM_DEVICE); /* * Drop the lock here since it might end up calling Patches currently in stable-queue which might be from cyrille.pitchen@xxxxxxxxx are queue-3.19/tty-serial-at91-fix-error-handling-in-atmel_serial_probe.patch queue-3.19/tty-serial-at91-enable-peripheral-clock-before-accessing-i-o-registers.patch queue-3.19/tty-serial-at91-use-correct-type-for-dma_sync_-_for_cpu-and-dma_sync_-_for_device.patch -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html