Skip to content

Commit

Permalink
serial: sh-sci: fix compilation breakage, when DMA is enabled
Browse files Browse the repository at this point in the history
A recent commit:

commit d6fa5a4
Author: Guennadi Liakhovetski <[email protected]>
    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 <[email protected]>
Signed-off-by: Paul Mundt <[email protected]>
  • Loading branch information
lyakh authored and pmundt committed Aug 1, 2012
1 parent 4f46f8a commit 4dc4c51
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/tty/serial/sh-sci.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

#include <linux/module.h>
#include <linux/errno.h>
#include <linux/sh_dma.h>
#include <linux/timer.h>
#include <linux/interrupt.h>
#include <linux/tty.h>
Expand Down Expand Up @@ -1410,8 +1411,8 @@ static void work_fn_rx(struct work_struct *work)
/* Handle incomplete DMA receive */
struct tty_struct *tty = port->state->port.tty;
struct dma_chan *chan = s->chan_rx;
struct sh_desc *sh_desc = container_of(desc, struct sh_desc,
async_tx);
struct shdma_desc *sh_desc = container_of(desc,
struct shdma_desc, async_tx);
unsigned long flags;
int count;

Expand Down

0 comments on commit 4dc4c51

Please sign in to comment.