Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4dc4c51675c137c30838425ecc8d471ff5eb138b

Authored by Guennadi Liakhovetski
Committed by Paul Mundt
1 parent 4f46f8ac80
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

serial: sh-sci: fix compilation breakage, when DMA is enabled 

A recent commit:

commit d6fa5a4e7ab605370fd6c982782f84ef2e6660e7
Author: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    serial: sh-sci: prepare for conversion to the shdma base library

is not sufficient to update the sh-sci driver to the new shdma driver
layout. This caused compilation breakage, when CONFIG_SERIAL_SH_SCI_DMA
is enabled. This patch trivially fixes the problem by updating the DMA
descriptor manipulation code.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

Showing 1 changed file with 3 additions and 2 deletions Side-by-side Diff

drivers/tty/serial/sh-sci.c
Diff comments   View file @ 4dc4c51
... ... @@ -25,6 +25,7 @@
25 25  
26 26 #include <linux/module.h>
27 27 #include <linux/errno.h>
  28 +#include <linux/sh_dma.h>
28 29 #include <linux/timer.h>
29 30 #include <linux/interrupt.h>
30 31 #include <linux/tty.h>
... ... @@ -1410,8 +1411,8 @@
1410 1411 /* Handle incomplete DMA receive */
1411 1412 struct tty_struct *tty = port->state->port.tty;
1412 1413 struct dma_chan *chan = s->chan_rx;
1413   - struct sh_desc *sh_desc = container_of(desc, struct sh_desc,
1414   - async_tx);
  1414 + struct shdma_desc *sh_desc = container_of(desc,
  1415 + struct shdma_desc, async_tx);
1415 1416 unsigned long flags;
1416 1417 int count;
1417 1418