projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'ioat' into dmaengine
[linux-drm-fsl-dcu.git]
/
drivers
/
serial
/
sh-sci.c
diff --git
a/drivers/serial/sh-sci.c
b/drivers/serial/sh-sci.c
index f7b9aff88f4a28836ef502b59ff37e77c32faf08..8bddc70bb5864488760230c59af7f1d5cc57b8c3 100644
(file)
--- a/
drivers/serial/sh-sci.c
+++ b/
drivers/serial/sh-sci.c
@@
-50,6
+50,7
@@
#include <linux/list.h>
#include <linux/dmaengine.h>
#include <linux/scatterlist.h>
#include <linux/list.h>
#include <linux/dmaengine.h>
#include <linux/scatterlist.h>
+#include <linux/slab.h>
#ifdef CONFIG_SUPERH
#include <asm/sh_bios.h>
#ifdef CONFIG_SUPERH
#include <asm/sh_bios.h>
@@
-779,10
+780,6
@@
static irqreturn_t sci_mpxed_interrupt(int irq, void *ptr)
if ((ssr_status & SCxSR_BRK(port)) && err_enabled)
ret = sci_br_interrupt(irq, ptr);
if ((ssr_status & SCxSR_BRK(port)) && err_enabled)
ret = sci_br_interrupt(irq, ptr);
- WARN_ONCE(ret == IRQ_NONE,
- "%s: %d IRQ %d, status %x, control %x\n", __func__,
- irq, port->line, ssr_status, scr_status);
-
return ret;
}
return ret;
}
@@
-1087,7
+1084,7
@@
static void work_fn_rx(struct work_struct *work)
unsigned long flags;
int count;
unsigned long flags;
int count;
- chan->device->device_
terminate_all(chan
);
+ chan->device->device_
control(chan, DMA_TERMINATE_ALL, 0
);
dev_dbg(port->dev, "Read %u bytes with cookie %d\n",
sh_desc->partial, sh_desc->cookie);
dev_dbg(port->dev, "Read %u bytes with cookie %d\n",
sh_desc->partial, sh_desc->cookie);