From patchwork Fri May 21 15:22:40 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 101434 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4LFMfnj003015 for ; Fri, 21 May 2010 15:22:41 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933566Ab0EUPWZ (ORCPT ); Fri, 21 May 2010 11:22:25 -0400 Received: from mail.gmx.net ([213.165.64.20]:46939 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S933117Ab0EUPWY (ORCPT ); Fri, 21 May 2010 11:22:24 -0400 Received: (qmail invoked by alias); 21 May 2010 15:22:22 -0000 Received: from p57BD1D79.dip0.t-ipconnect.de (EHLO axis700.grange) [87.189.29.121] by mail.gmx.net (mp004) with SMTP; 21 May 2010 17:22:22 +0200 X-Authenticated: #20450766 X-Provags-ID: V01U2FsdGVkX18q/cleZbkqJSo3AfMBYBq+l0sb3dbrWFFHtAKcya krw/yGHuucEg3P Received: from lyakh (helo=localhost) by axis700.grange with local-esmtp (Exim 4.63) (envelope-from ) id 1OFU3c-0005qe-FA; Fri, 21 May 2010 17:22:40 +0200 Date: Fri, 21 May 2010 17:22:40 +0200 (CEST) From: Guennadi Liakhovetski To: "linux-sh@vger.kernel.org" cc: linux-serial@vger.kernel.org Subject: [PATCH] sh: fix Oops in the serial SCI driver Message-ID: MIME-Version: 1.0 X-Y-GMX-Trusted: 0 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 21 May 2010 15:22:41 +0000 (UTC) diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c index 304a877..7b273c9 100644 --- a/drivers/serial/sh-sci.c +++ b/drivers/serial/sh-sci.c @@ -1007,8 +1007,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); }