From patchwork Wed Feb 9 07:46:47 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshihiro Shimoda X-Patchwork-Id: 543151 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p197kCxl001308 for ; Wed, 9 Feb 2011 07:46:53 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752383Ab1BIHqt (ORCPT ); Wed, 9 Feb 2011 02:46:49 -0500 Received: from relmlor4.renesas.com ([210.160.252.174]:63950 "EHLO relmlor4.renesas.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752343Ab1BIHqs (ORCPT ); Wed, 9 Feb 2011 02:46:48 -0500 Received: from relmlir3.idc.renesas.com ([10.200.68.153]) by relmlor4.idc.renesas.com ( SJSMS) with ESMTP id <0LGC007VMAY0P950@relmlor4.idc.renesas.com> for linux-sh@vger.kernel.org; Wed, 09 Feb 2011 16:46:48 +0900 (JST) Received: from relmlac3.idc.renesas.com ([10.200.69.23]) by relmlir3.idc.renesas.com ( SJSMS) with ESMTP id <0LGC00NRUAY02450@relmlir3.idc.renesas.com> for linux-sh@vger.kernel.org; Wed, 09 Feb 2011 16:46:48 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id DFA2C18083; Wed, 09 Feb 2011 16:46:47 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id B788618086; Wed, 09 Feb 2011 16:46:47 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac3.idc.renesas.com with ESMTP id SAA26694; Wed, 09 Feb 2011 16:46:47 +0900 X-IronPort-AV: E=Sophos; i="4.60,446,1291561200"; d="scan'208"; a="10625069" Received: from unknown (HELO [172.30.8.157]) ([172.30.8.157]) by relmlii1.idc.renesas.com with ESMTP; Wed, 09 Feb 2011 16:46:47 +0900 Message-id: <4D524667.3040306@renesas.com> Date: Wed, 09 Feb 2011 16:46:47 +0900 From: Yoshihiro Shimoda User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.13) Gecko/20101207 Thunderbird/3.1.7 MIME-version: 1.0 To: SH-Linux Cc: Paul Mundt , dan.j.williams@intel.com Subject: [PATCH v2] dma: shdma: add checking the DMAOR_AE in sh_dmae_err Content-type: text/plain; charset=ISO-8859-1 Content-transfer-encoding: 7bit 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.6 (demeter1.kernel.org [140.211.167.41]); Wed, 09 Feb 2011 07:47:09 +0000 (UTC) diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c index 28720d3..3e4c627 100644 --- a/drivers/dma/shdma.c +++ b/drivers/dma/shdma.c @@ -865,7 +865,12 @@ static unsigned int sh_dmae_reset(struct sh_dmae_device *shdev) static irqreturn_t sh_dmae_err(int irq, void *data) { - return IRQ_RETVAL(sh_dmae_reset(data)); + struct sh_dmae_device *shdev = data; + + if (dmaor_read(shdev) & DMAOR_AE) + return IRQ_RETVAL(sh_dmae_reset(data)); + else + return IRQ_NONE; } static void dmae_do_tasklet(unsigned long data)