diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2010-05-21 15:22:40 +0000 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-22 17:06:34 +0900 |
| commit | 85b8e3ffc47b2a1913be3079e9f1c1f66a6240b2 (patch) | |
| tree | 4eb1948eb62060280f5d57030dfb13edae049103 /drivers/serial | |
| parent | bb0fe533514c1d480c6c16f8bad070270a73a96c (diff) | |
| download | op-kernel-dev-85b8e3ffc47b2a1913be3079e9f1c1f66a6240b2.zip op-kernel-dev-85b8e3ffc47b2a1913be3079e9f1c1f66a6240b2.tar.gz | |
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>
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/sh-sci.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c index 4f73fb7..5f90fcd 100644 --- a/drivers/serial/sh-sci.c +++ b/drivers/serial/sh-sci.c @@ -1004,8 +1004,9 @@ static void sci_rx_dma_release(struct sci_port *s, bool enable_pio) s->chan_rx = NULL; s->cookie_rx[0] = s->cookie_rx[1] = -EINVAL; dma_release_channel(chan); - dma_free_coherent(port->dev, s->buf_len_rx * 2, - sg_virt(&s->sg_rx[0]), sg_dma_address(&s->sg_rx[0])); + if (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) sci_start_rx(port); } |
