Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 77f890223338c890fc33972673d2bd3a53061570

Authored by Linus Torvalds
2 parents 4193d91635 cc60f8878e
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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

* '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

Showing 2 changed files Side-by-side Diff

... ... @@ -580,7 +580,6 @@
580 580  
581 581 sh_chan = to_sh_chan(chan);
582 582 param = chan->private;
583   - slave_addr = param->config->addr;
584 583  
585 584 /* Someone calling slave DMA on a public channel? */
586 585 if (!param || !sg_len) {
... ... @@ -588,6 +587,8 @@
588 587 __func__, param, sg_len, param ? param->slave_id : -1);
589 588 return NULL;
590 589 }
  590 +
  591 + slave_addr = param->config->addr;
591 592  
592 593 /*
593 594 * if (param != NULL), this is a successfully requested slave channel,
include/linux/dmaengine.h
Diff comments   View file @ 77f8902
... ... @@ -548,7 +548,7 @@
548 548 return (dma->max_pq & DMA_HAS_PQ_CONTINUE) == DMA_HAS_PQ_CONTINUE;
549 549 }
550 550  
551   -static unsigned short dma_dev_to_maxpq(struct dma_device *dma)
  551 +static inline unsigned short dma_dev_to_maxpq(struct dma_device *dma)
552 552 {
553 553 return dma->max_pq & ~DMA_HAS_PQ_CONTINUE;
554 554 }