From a325820b5be2c1602dee291bf53df5e4b1423e63 Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Fri, 21 May 2010 15:22:40 +0000 Subject: [PATCH] --- yaml --- r: 198133 b: refs/heads/master c: 85b8e3ffc47b2a1913be3079e9f1c1f66a6240b2 h: refs/heads/master i: 198131: 346ff2d6b09b522cd4b461f58104121040ca8724 v: v3 --- [refs] | 2 +- trunk/drivers/serial/sh-sci.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0622520ec6c7..c70caa0c2c10 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb0fe533514c1d480c6c16f8bad070270a73a96c +refs/heads/master: 85b8e3ffc47b2a1913be3079e9f1c1f66a6240b2 diff --git a/trunk/drivers/serial/sh-sci.c b/trunk/drivers/serial/sh-sci.c index 4f73fb756745..5f90fcd7d107 100644 --- a/trunk/drivers/serial/sh-sci.c +++ b/trunk/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); }