From patchwork Tue Jun 7 17:38:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 69571 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp2096932qgf; Tue, 7 Jun 2016 10:40:45 -0700 (PDT) X-Received: by 10.98.28.148 with SMTP id c142mr616323pfc.102.1465321245896; Tue, 07 Jun 2016 10:40:45 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r4si35878712pfr.48.2016.06.07.10.40.44; Tue, 07 Jun 2016 10:40:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756116AbcFGRkm (ORCPT + 31 others); Tue, 7 Jun 2016 13:40:42 -0400 Received: from mail-wm0-f49.google.com ([74.125.82.49]:36823 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756084AbcFGRi7 (ORCPT ); Tue, 7 Jun 2016 13:38:59 -0400 Received: by mail-wm0-f49.google.com with SMTP id n184so147711050wmn.1 for ; Tue, 07 Jun 2016 10:38:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=E9dMYvg9yq2xaqJRGex8AQDYGrIO76Nv9AU48QlKZ1o=; b=ftK/2Gg4ERFn2xSKCaTEcbEmK8fPSjqKe7OuxlFbt3b+aqFMvrvdwZxqikLVWMsCgX rSCGocnPzEAd2hdqm+k1WbgoSEKmtV/oO9X1rs5w67Fa57y6wVTlWEv8PHVdy4Hs3K50 Ax0MG0Y9xD7vKn1NrHQWPIs44xn61xiXBZfUY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=E9dMYvg9yq2xaqJRGex8AQDYGrIO76Nv9AU48QlKZ1o=; b=eKRNcSR17tyoPgWiH5DqsYyTIHw7mXhf4T1nxb5GnFdU2YpsAdBF+fBN+vKZe7OLqv +prI0VhUCt3TPZhp0XXXpIyZgtWh8z8AvBkfXwloh0kpgeaA0ihLrvpBsxrlDqFAwDIq C70SwjVaZ5vVezNtrRPYHtRgfBXgN0lXSgokFdus/4jd791wGNDBOyCg+svJwUci1ZqQ w3suqePf6tz9KVl/insjtAcZJyUShtdyQq9HQEndWkx/aSnYQxVwQ/ezRPV8/AnRV2xU Y8d7OGum8Z0Bjjs8xtw5NRWICzLPAVy7hfd+e8KQTybPXXexVZaXzlB/z0KIWzfyqfiM k5vg== X-Gm-Message-State: ALyK8tJ2FOzHOwGqG0H5JnKJNVRkE1sdUtbMWeWx2RyjdsQW6R7lcyxNKMg8HXpDFKmVsl03 X-Received: by 10.194.97.41 with SMTP id dx9mr552752wjb.60.1465321137382; Tue, 07 Jun 2016 10:38:57 -0700 (PDT) Received: from localhost.localdomain (cpc84731-aztw28-2-0-cust112.18-1.cable.virginm.net. [82.37.67.113]) by smtp.gmail.com with ESMTPSA id h8sm1310031wjg.9.2016.06.07.10.38.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 07 Jun 2016 10:38:56 -0700 (PDT) From: Peter Griffin To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@stlinux.com, vinod.koul@intel.com, linus.walleij@linaro.org, dan.j.williams@intel.com, leoli@freescale.com, zw@zh-kernel.org, baohua@kernel.org, maxime.ripard@free-electrons.com, wens@csie.org, ldewangan@nvidia.com, jonathanh@nvidia.com, swarren@wwwdotorg.org, thierry.reding@gmail.com, gnurou@gmail.com Cc: peter.griffin@linaro.org, lee.jones@linaro.org, dmaengine@vger.kernel.org, linux-tegra@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH 7/8] dmaengine: tegra20-apb-dma: Only calculate residue if txstate exists. Date: Tue, 7 Jun 2016 18:38:40 +0100 Message-Id: <1465321121-22238-8-git-send-email-peter.griffin@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1465321121-22238-1-git-send-email-peter.griffin@linaro.org> References: <1465321121-22238-1-git-send-email-peter.griffin@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There is no point calculating the residue if there is no txstate to store the value. Signed-off-by: Peter Griffin --- drivers/dma/tegra20-apb-dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.9.1 diff --git a/drivers/dma/tegra20-apb-dma.c b/drivers/dma/tegra20-apb-dma.c index 01e316f..7f4af8c 100644 --- a/drivers/dma/tegra20-apb-dma.c +++ b/drivers/dma/tegra20-apb-dma.c @@ -814,7 +814,7 @@ static enum dma_status tegra_dma_tx_status(struct dma_chan *dc, unsigned int residual; ret = dma_cookie_status(dc, cookie, txstate); - if (ret == DMA_COMPLETE) + if (ret == DMA_COMPLETE || !txstate) return ret; spin_lock_irqsave(&tdc->lock, flags);