From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Vinod Koul <vinod.koul@intel.com>,
linux-kernel@vger.kernel.org,
Viresh Kumar <viresh.kumar@linaro.org>,
spear-devel <spear-devel@list.st.com>
Subject: [PATCHv2 03/11] dma: dw_dmac: check direction properly in dw_dma_cyclic_prep
Date: Thu, 10 Jan 2013 10:52:58 +0200 [thread overview]
Message-ID: <1357807986-4026-4-git-send-email-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <1357807986-4026-1-git-send-email-andriy.shevchenko@linux.intel.com>
dma_transfer_direction is a normal enum. It means we can't usually use the
values as bit fields. Let's adjust this check and move it above the usage of
the direction parameter, due to the nature of the following usage of it.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
---
drivers/dma/dw_dmac.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c
index 6c9e20a..ca996bc 100644
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
@@ -1355,6 +1355,9 @@ struct dw_cyclic_desc *dw_dma_cyclic_prep(struct dma_chan *chan,
retval = ERR_PTR(-EINVAL);
+ if (unlikely(!is_slave_direction(direction)))
+ goto out_err;
+
if (direction == DMA_MEM_TO_DEV)
reg_width = __ffs(sconfig->dst_addr_width);
else
@@ -1369,8 +1372,6 @@ struct dw_cyclic_desc *dw_dma_cyclic_prep(struct dma_chan *chan,
goto out_err;
if (unlikely(buf_addr & ((1 << reg_width) - 1)))
goto out_err;
- if (unlikely(!(direction & (DMA_MEM_TO_DEV | DMA_DEV_TO_MEM))))
- goto out_err;
retval = ERR_PTR(-ENOMEM);
--
1.7.10.4
next prev parent reply other threads:[~2013-01-10 8:54 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-10 8:52 [PATCHv2 00/11] patches against slave dma subsystem Andy Shevchenko
2013-01-10 8:52 ` [PATCHv2 01/11] dmaengine: introduce is_slave_direction function Andy Shevchenko
2013-01-10 8:52 ` [PATCHv2 02/11] dma: at_hdmac: check direction properly for cyclic transfers Andy Shevchenko
2013-01-10 8:52 ` Andy Shevchenko [this message]
2013-01-10 8:52 ` [PATCHv2 04/11] dma: ep93xx_dma: reuse is_slave_direction helper Andy Shevchenko
2013-01-10 8:53 ` [PATCHv2 05/11] dma: ipu_idmac: " Andy Shevchenko
2013-01-10 8:53 ` [PATCHv2 06/11] dma: ste_dma40: " Andy Shevchenko
2013-01-10 8:53 ` [PATCHv2 07/11] dw_dmac: call .probe after we have a device in place Andy Shevchenko
2013-01-10 8:53 ` [PATCHv2 08/11] dw_dmac: store direction in the custom channel structure Andy Shevchenko
2013-01-10 8:53 ` [PATCHv2 09/11] dw_dmac: make usage of dw_dma_slave optional Andy Shevchenko
2013-01-10 9:08 ` Andy Shevchenko
2013-01-10 9:11 ` [PATCHv2.1] " Andy Shevchenko
2013-01-10 8:53 ` [PATCHv2 10/11] dw_dmac: backlink to dw_dma in dw_dma_chan is superfluous Andy Shevchenko
2013-01-10 8:53 ` [PATCHv2 11/11] dma: dw_dmac: clear suspend bit during termination Andy Shevchenko
2013-01-12 13:09 ` [PATCHv2 00/11] patches against slave dma subsystem Vinod Koul
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1357807986-4026-4-git-send-email-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=spear-devel@list.st.com \
--cc=vinod.koul@intel.com \
--cc=viresh.kumar@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).