Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77f89022 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 4193d916 cc60f887

drivers/dma/shdma.c

+2 −1
Original line number Diff line number Diff line
@@ -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.

include/linux/dmaengine.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

}



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;

}