aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2012-07-30 15:28:47 -0400
committerPaul Mundt <lethal@linux-sh.org>2012-08-01 00:48:54 -0400
commit4dc4c51675c137c30838425ecc8d471ff5eb138b (patch)
treef6756522266928cc74be1c55ec9453b0a007b082 /drivers/tty
parent4f46f8ac80416b0e8fd3aba6a0d842205fb29140 (diff)
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>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/sh-sci.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index d4d8c9453cd8..9be296cf7295 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -25,6 +25,7 @@
25 25
26#include <linux/module.h> 26#include <linux/module.h>
27#include <linux/errno.h> 27#include <linux/errno.h>
28#include <linux/sh_dma.h>
28#include <linux/timer.h> 29#include <linux/timer.h>
29#include <linux/interrupt.h> 30#include <linux/interrupt.h>
30#include <linux/tty.h> 31#include <linux/tty.h>
@@ -1410,8 +1411,8 @@ static void work_fn_rx(struct work_struct *work)
1410 /* Handle incomplete DMA receive */ 1411 /* Handle incomplete DMA receive */
1411 struct tty_struct *tty = port->state->port.tty; 1412 struct tty_struct *tty = port->state->port.tty;
1412 struct dma_chan *chan = s->chan_rx; 1413 struct dma_chan *chan = s->chan_rx;
1413 struct sh_desc *sh_desc = container_of(desc, struct sh_desc, 1414 struct shdma_desc *sh_desc = container_of(desc,
1414 async_tx); 1415 struct shdma_desc, async_tx);
1415 unsigned long flags; 1416 unsigned long flags;
1416 int count; 1417 int count;
1417 1418