projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'iwlwifi-for-john-2014-11-23' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
dma
/
edma.c
diff --git
a/drivers/dma/edma.c
b/drivers/dma/edma.c
index 7b65633f495ed28ca77842231ea65a01c8870f4c..123f578d6dd3b82d37887182fc092937c40e59d4 100644
(file)
--- a/
drivers/dma/edma.c
+++ b/
drivers/dma/edma.c
@@
-288,7
+288,7
@@
static int edma_slave_config(struct edma_chan *echan,
static int edma_dma_pause(struct edma_chan *echan)
{
/* Pause/Resume only allowed with cyclic mode */
- if (!echan->edesc->cyclic)
+ if (!echan->edesc
|| !echan->edesc
->cyclic)
return -EINVAL;
edma_pause(echan->ch_num);