From patchwork Thu Apr 12 16:12:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 7766 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 267BA23E49 for ; Thu, 12 Apr 2012 16:13:09 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id DC63AA183F1 for ; Thu, 12 Apr 2012 16:13:08 +0000 (UTC) Received: by iage36 with SMTP id e36so4071949iag.11 for ; Thu, 12 Apr 2012 09:13:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:mime-version:content-type :x-gm-message-state; bh=i+7CWX4URBFxnf7dvKyjBaI7CT6Co8w0TLEG99dk5gE=; b=krJ9nvfiwI6kOSnJqr9g+9FnFnbZhu1D0IAVKTrcYIkBGikhA1s6Zxj1fTiRzPW7l5 uIaM+Tx3AaO/0cdxGKZK85pUQvfse1o3bPwKYe8bUVo3CH5yeGDToj4gYmBFl5tmx+R0 Xb1VPAFtrXK63aqWM3F0CYhvSI/3UVX3Z5goYQw5dKNAGggFaKP9dC2U2VFPC4ssAOfn JbwOPCdHFGK2X7IxRzvVVRleAM2bbD1Z0B8W403hsPnXaNnjgRmmhVYnTfjCRSTAFL6f GkVOzc3y13SYiSipJ2ADZDmJW8oTpzLUIWf8HtPbbKlhF6i/bbEnED9bJpNm6kKom7kQ qQ9w== Received: by 10.50.149.163 with SMTP id ub3mr6765266igb.30.1334247188348; Thu, 12 Apr 2012 09:13:08 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.70.69 with SMTP id c5csp273746ibj; Thu, 12 Apr 2012 09:13:07 -0700 (PDT) Received: by 10.213.105.132 with SMTP id t4mr270655ebo.107.1334247186926; Thu, 12 Apr 2012 09:13:06 -0700 (PDT) Received: from eu1sys200aog117.obsmtp.com (eu1sys200aog117.obsmtp.com. [207.126.144.143]) by mx.google.com with SMTP id g48si1806007eeo.183.2012.04.12.09.13.03 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 12 Apr 2012 09:13:06 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.143 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.143; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.143 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) smtp.mail=linus.walleij@stericsson.com Received: from beta.dmz-eu.st.com ([164.129.1.35]) (using TLSv1) by eu1sys200aob117.postini.com ([207.126.147.11]) with SMTP ID DSNKT4b/DorhUp5RQxafNthNH3qu0bO+XmAy@postini.com; Thu, 12 Apr 2012 16:13:06 UTC Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 7BAC2105; Thu, 12 Apr 2012 16:12:57 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 1A6A227F5; Thu, 12 Apr 2012 16:12:57 +0000 (GMT) Received: from exdcvycastm022.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm022", Issuer "exdcvycastm022" (not verified)) by relay1.stm.gmessaging.net (Postfix) with ESMTPS id 5A9C624C075; Thu, 12 Apr 2012 18:12:48 +0200 (CEST) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.30) with Microsoft SMTP Server (TLS) id 8.3.83.0; Thu, 12 Apr 2012 18:12:56 +0200 From: Linus Walleij To: Vinod Koul Cc: , Dan Williams , Lee Jones , Philippe Langlais , Linus Walleij Subject: [PATCH 2/2] dma/ste_dma40: fix erroneous comparison Date: Thu, 12 Apr 2012 18:12:52 +0200 Message-ID: <1334247172-17388-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.9.2 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQkCAdtPPb4tI/Ol1C4rETC5p9a0k1+7y7vW7VepgCS1/QnsE0OkbursxE13v5z2adA9qKNa From: Linus Walleij A small fallout from Vinod's conversions to dma_transfer_direction, this small comparison was done with a dma_data_direction instead. Fix it by comparing against the correct enum. Signed-off-by: Linus Walleij --- drivers/dma/ste_dma40.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index 94d760e..f591194 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -2071,7 +2071,7 @@ d40_prep_sg(struct dma_chan *dchan, struct scatterlist *sg_src, if (sg_next(&sg_src[sg_len - 1]) == sg_src) desc->cyclic = true; - if (direction != DMA_NONE) { + if (direction != DMA_TRANS_NONE) { dma_addr_t dev_addr = d40_get_dev_addr(chan, direction); if (direction == DMA_DEV_TO_MEM)