| Message ID | 830a2b33ab0226405dc310c8a6d43731bf4ca8f9.1418131298.git.cyrille.pitchen@atmel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Le 09/12/2014 14:31, Cyrille Pitchen a écrit : > 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@atmel.com> Sure: Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Here it's difficult to add a "stable" tag as the error was introduced by several different patches. Thanks. > --- > drivers/tty/serial/atmel_serial.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c > index 4d848a2..756f567 100644 > --- 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_port *port) > 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 uart_port *port) > 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 uart_port *port) > 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 >
On Fri, Jan 09, 2015 at 04:13:59PM +0100, Nicolas Ferre wrote: > Le 09/12/2014 14:31, Cyrille Pitchen a écrit : > > 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@atmel.com> > > Sure: > Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > > Here it's difficult to add a "stable" tag as the error was introduced by > several different patches. So that means it's not ok for older kernels? That doesn't make sense...
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c index 4d848a2..756f567 100644 --- 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_port *port) 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 uart_port *port) 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 uart_port *port) 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
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@atmel.com> --- drivers/tty/serial/atmel_serial.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)