Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85b8e3ff authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Paul Mundt
Browse files

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: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent bb0fe533

drivers/serial/sh-sci.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -1004,6 +1004,7 @@ 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);

	if (sg_dma_address(&s->sg_rx[0]))

		dma_free_coherent(port->dev, s->buf_len_rx * 2,

		dma_free_coherent(port->dev, s->buf_len_rx * 2,

				  sg_virt(&s->sg_rx[0]), sg_dma_address(&s->sg_rx[0]));

				  sg_virt(&s->sg_rx[0]), sg_dma_address(&s->sg_rx[0]));

	if (enable_pio)

	if (enable_pio)