aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Aaberg <jonas.aberg@stericsson.com>2010-08-09 12:08:49 +0000
committerDan Williams <dan.j.williams@intel.com>2010-09-22 14:53:46 -0700
commit69f93faa57ed6c91b32aae1dcff7282fcb2872f5 (patch)
tree44a1e6ce05bae3d15d1cc028f10fc1dc46a2c54c
parent9dbfbd35ce16e4f5a4d0d9e3f6e012b136fe80ea (diff)
downloadmrst-s0i3-test-69f93faa57ed6c91b32aae1dcff7282fcb2872f5.tar.gz
mrst-s0i3-test-69f93faa57ed6c91b32aae1dcff7282fcb2872f5.tar.xz
mrst-s0i3-test-69f93faa57ed6c91b32aae1dcff7282fcb2872f5.zip
DMAENGINE: ste_dma40: fix possible use of uninitialized variable
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
-rw-r--r--drivers/dma/ste_dma40.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index 2b209fa004b..ac325e91817 100644
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -684,12 +684,12 @@ static void d40_config_write(struct d40_chan *d40c)
static void d40_desc_load(struct d40_chan *d40c, struct d40_desc *d40d)
{
- if (d40d->lli_phy.dst && d40d->lli_phy.src) {
+ if (d40c->log_num == D40_PHY_CHAN) {
d40_phy_lli_write(d40c->base->virtbase,
d40c->phy_chan->num,
d40d->lli_phy.dst,
d40d->lli_phy.src);
- } else if (d40d->lli_log.dst && d40d->lli_log.src) {
+ } else {
struct d40_log_lli *src = d40d->lli_log.src;
struct d40_log_lli *dst = d40d->lli_log.dst;
int s;