From patchwork Fri Dec 13 23:16:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 22458 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f71.google.com (mail-pa0-f71.google.com [209.85.220.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C96A7202E2 for ; Fri, 13 Dec 2013 23:16:21 +0000 (UTC) Received: by mail-pa0-f71.google.com with SMTP id kl14sf2118393pab.6 for ; Fri, 13 Dec 2013 15:16:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe:content-type:content-transfer-encoding; bh=Q/egTU3hh78R7ZQpX+JV3BbK6k83oAd5AReqHHOzQaA=; b=UnNNOVM7uZREf6Yt8P+hYiLEJ9w9skrRsoqV9FsWbgknMvO46VZk8/q/iHuC0COMlf TFdbAf7qKyUrP3qdAb9a2+ygoyw87LIP9GWTmpTEcQRLo3ccYDn2wa6UHnDGdXKU44xE Zukd8xjszAyDDZc2LOnV8e87igV5lui/oPXPJqAy4pO4ezxK6YrYlPjIJTTizuG26nx9 V1KtDiXxcDonynyKXY2HyZIKSBTUzYYxGJRmhTBCZRb+YWMq1foOIUq5tEwwNIjNwqeV d1oRxdAygnhJyv2Z736xfmYaTalSAkNyXSeLlU1FS8aF+yyKPAdOWTlStf3SRECS1yzK 30Wg== X-Gm-Message-State: ALoCoQnp+KfSqx4OhBd6brjeDkdvpiK1ro4nwkDXSJHGxP0IK/gqAenOsNsEu5Nwnof9XsKZ6YLH X-Received: by 10.66.220.163 with SMTP id px3mr3318584pac.38.1386976580410; Fri, 13 Dec 2013 15:16:20 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.127.46 with SMTP id nd14ls1182791qeb.19.gmail; Fri, 13 Dec 2013 15:16:20 -0800 (PST) X-Received: by 10.221.51.206 with SMTP id vj14mr2281639vcb.17.1386976580222; Fri, 13 Dec 2013 15:16:20 -0800 (PST) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by mx.google.com with ESMTPS id pu5si1222115veb.135.2013.12.13.15.16.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 15:16:20 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.174 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.174; Received: by mail-vc0-f174.google.com with SMTP id id10so1756753vcb.19 for ; Fri, 13 Dec 2013 15:16:20 -0800 (PST) X-Received: by 10.52.23.13 with SMTP id i13mr1948117vdf.0.1386976580130; Fri, 13 Dec 2013 15:16:20 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp76218vcz; Fri, 13 Dec 2013 15:16:19 -0800 (PST) X-Received: by 10.112.181.3 with SMTP id ds3mr176679lbc.54.1386976579086; Fri, 13 Dec 2013 15:16:19 -0800 (PST) Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com [209.85.217.179]) by mx.google.com with ESMTPS id ww4si121890lbb.12.2013.12.13.15.16.18 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 15:16:19 -0800 (PST) Received-SPF: neutral (google.com: 209.85.217.179 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=209.85.217.179; Received: by mail-lb0-f179.google.com with SMTP id w7so55682lbi.38 for ; Fri, 13 Dec 2013 15:16:18 -0800 (PST) X-Received: by 10.152.116.46 with SMTP id jt14mr2871163lab.31.1386976578411; Fri, 13 Dec 2013 15:16:18 -0800 (PST) Received: from localhost.localdomain (c83-254-151-69.bredband.comhem.se. [83.254.151.69]) by mx.google.com with ESMTPSA id tc8sm401525lbb.9.2013.12.13.15.16.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Dec 2013 15:16:17 -0800 (PST) From: Linus Walleij To: Vinod Koul Cc: linux-kernel@vger.kernel.org, Linus Walleij , stable@vger.kernel.org, Dan Williams , Alban Bedel , Tomasz Figa Subject: [PATCH 1/2] dma: pl08x: fix descriptor unmapping Date: Sat, 14 Dec 2013 00:16:07 +0100 Message-Id: <1386976567-31343-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.174 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The descriptor unmapping code introduced in commit d38a8c622a1b3 "dmaengine: prepare for generic 'unmap' data" accidentally affects a local struct rather than the async TX descriptor, resulting in this compile error: CC drivers/dma/amba-pl08x.o drivers/dma/amba-pl08x.c: In function ‘pl08x_desc_free’: drivers/dma/amba-pl08x.c:1172:2: warning: passing argument 1 of ‘dma_descriptor_unmap’ from incompatible pointer type [enabled by default] In file included from linux/include/linux/amba/pl08x.h:21:0, from linux/drivers/dma/amba-pl08x.c:79: linux/include/linux/dmaengine.h:476:20: note: expected ‘struct dma_async_tx_descriptor *’ but argument is of type ‘struct pl08x_txd *’ Cc: stable@vger.kernel.org Cc: Dan Williams Cc: Alban Bedel Cc: Tomasz Figa Signed-off-by: Linus Walleij --- drivers/dma/amba-pl08x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c index 16a2aa28f856..ec4ee5c1fe9d 100644 --- a/drivers/dma/amba-pl08x.c +++ b/drivers/dma/amba-pl08x.c @@ -1169,7 +1169,7 @@ static void pl08x_desc_free(struct virt_dma_desc *vd) struct pl08x_txd *txd = to_pl08x_txd(&vd->tx); struct pl08x_dma_chan *plchan = to_pl08x_chan(vd->tx.chan); - dma_descriptor_unmap(txd); + dma_descriptor_unmap(&vd->tx); if (!txd->done) pl08x_release_mux(plchan);