Signed-off-by: Guennadi Liakhovetski g.liakhovetski@gmx.de --- drivers/tty/serial/sh-sci.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index 7508579..8b99aac 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -1574,9 +1574,9 @@ static bool filter(struct dma_chan *chan, void *slave) struct sh_dmae_slave *param = slave;
dev_dbg(chan->device->dev, "%s: slave ID %d\n", __func__, - param->slave_id); + param->simple_slave.slave_id);
- chan->private = param; + chan->private = ¶m->simple_slave; return true; }
@@ -1615,7 +1615,7 @@ static void sci_request_dma(struct uart_port *port) param = &s->param_tx;
/* Slave ID, e.g., SHDMA_SLAVE_SCIF0_TX */ - param->slave_id = s->cfg->dma_slave_tx; + param->simple_slave.slave_id = s->cfg->dma_slave_tx;
s->cookie_tx = -EINVAL; chan = dma_request_channel(mask, filter, param); @@ -1643,7 +1643,7 @@ static void sci_request_dma(struct uart_port *port) param = &s->param_rx;
/* Slave ID, e.g., SHDMA_SLAVE_SCIF0_RX */ - param->slave_id = s->cfg->dma_slave_rx; + param->simple_slave.slave_id = s->cfg->dma_slave_rx;
chan = dma_request_channel(mask, filter, param); dev_dbg(port->dev, "%s: RX: got channel %p\n", __func__, chan);