leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

Browse Source 
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
  dmaengine: fix interrupt clearing for mv_xor
  missing inline keyword for static function in linux/dmaengine.h
  dma/shdma: move dereference below the NULL check
This commit is contained in:
Linus Torvalds 2010-09-29 18:41:19 -07:00
commit 77f8902233
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/dma/shdma.c
View File

@ -580,7 +580,6 @@ static struct dma_async_tx_descriptor *sh_dmae_prep_slave_sg(
sh_chan = to_sh_chan(chan); sh_chan = to_sh_chan(chan);
param = chan->private; param = chan->private;
slave_addr = param->config->addr;
/* Someone calling slave DMA on a public channel? */ /* Someone calling slave DMA on a public channel? */
if (!param || !sg_len) { if (!param || !sg_len) {
@ -589,6 +588,8 @@ static struct dma_async_tx_descriptor *sh_dmae_prep_slave_sg(
return NULL; return NULL;
} }
slave_addr = param->config->addr;
/* /*
* if (param != NULL), this is a successfully requested slave channel, * if (param != NULL), this is a successfully requested slave channel,
* therefore param->config != NULL too. * therefore param->config != NULL too.

2
include/linux/dmaengine.h
View File

@ -548,7 +548,7 @@ static inline bool dma_dev_has_pq_continue(struct dma_device *dma)
return (dma->max_pq & DMA_HAS_PQ_CONTINUE) == DMA_HAS_PQ_CONTINUE; return (dma->max_pq & DMA_HAS_PQ_CONTINUE) == DMA_HAS_PQ_CONTINUE;
} }
static unsigned short dma_dev_to_maxpq(struct dma_device *dma) static inline unsigned short dma_dev_to_maxpq(struct dma_device *dma)
{ {
return dma->max_pq & ~DMA_HAS_PQ_CONTINUE; return dma->max_pq & ~DMA_HAS_PQ_CONTINUE;
} }