diff options
| author | Dan Carpenter <error27@gmail.com> | 2010-08-14 13:01:45 +0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2010-09-23 02:29:17 +0400 |
| commit | 9f9ff20d46c6728b092f34b6a642e1e81ab5e254 (patch) | |
| tree | ecf89d4f01277ce8c747fee02a67c6fb5f217ca3 /drivers/dma | |
| parent | b30a3f6257ed2105259b404d419b4964e363928c (diff) | |
| download | linux-9f9ff20d46c6728b092f34b6a642e1e81ab5e254.tar.xz | |
dma/shdma: move dereference below the NULL check
"param" can be NULL here, so only dereference it after the check.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/shdma.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c index fb64cf36ba61..eb6b54dbb806 100644 --- a/drivers/dma/shdma.c +++ b/drivers/dma/shdma.c @@ -580,7 +580,6 @@ static struct dma_async_tx_descriptor *sh_dmae_prep_slave_sg( sh_chan = to_sh_chan(chan); param = chan->private; - slave_addr = param->config->addr; /* Someone calling slave DMA on a public channel? */ if (!param || !sg_len) { @@ -589,6 +588,8 @@ static struct dma_async_tx_descriptor *sh_dmae_prep_slave_sg( return NULL; } + slave_addr = param->config->addr; + /* * if (param != NULL), this is a successfully requested slave channel, * therefore param->config != NULL too. |