Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index aaef223df676..c291b3add1d2 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -1025,8 +1025,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);
 }