openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

sh: fix Oops in the serial SCI driver 

Fix an Oops, triggering, if the DMA buffer allocation for the Rx channel in
sh-sci.c fails.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Guennadi Liakhovetski 2010-05-21 15:22:40 +00:00 committed by Paul Mundt
parent bb0fe53351
commit 85b8e3ffc4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/serial/sh-sci.c
View File

@ -1004,8 +1004,9 @@ static void sci_rx_dma_release(struct sci_port *s, bool enable_pio)
s->chan_rx = NULL; s->chan_rx = NULL;
s->cookie_rx[0] = s->cookie_rx[1] = -EINVAL; s->cookie_rx[0] = s->cookie_rx[1] = -EINVAL;
dma_release_channel(chan); dma_release_channel(chan);
dma_free_coherent(port->dev, s->buf_len_rx * 2, if (sg_dma_address(&s->sg_rx[0]))
sg_virt(&s->sg_rx[0]), sg_dma_address(&s->sg_rx[0])); dma_free_coherent(port->dev, s->buf_len_rx * 2,
sg_virt(&s->sg_rx[0]), sg_dma_address(&s->sg_rx[0]));
if (enable_pio) if (enable_pio)
sci_start_rx(port); sci_start_rx(port);
} }