diff options
-rw-r--r-- | drivers/dma/timb_dma.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/dma/timb_dma.c b/drivers/dma/timb_dma.c index 4dd710246c79..145f1c23408f 100644 --- a/drivers/dma/timb_dma.c +++ b/drivers/dma/timb_dma.c | |||
@@ -79,7 +79,10 @@ struct timb_dma_desc { | |||
79 | struct timb_dma_chan { | 79 | struct timb_dma_chan { |
80 | struct dma_chan chan; | 80 | struct dma_chan chan; |
81 | void __iomem *membase; | 81 | void __iomem *membase; |
82 | spinlock_t lock; /* Used for mutual exclusion */ | 82 | spinlock_t lock; /* Used to protect data structures, |
83 | especially the lists and descriptors, | ||
84 | from races between the tasklet and calls | ||
85 | from above */ | ||
83 | dma_cookie_t last_completed_cookie; | 86 | dma_cookie_t last_completed_cookie; |
84 | bool ongoing; | 87 | bool ongoing; |
85 | struct list_head active_list; | 88 | struct list_head active_list; |
@@ -197,7 +200,7 @@ static int td_fill_desc(struct timb_dma_chan *td_chan, u8 *dma_desc, | |||
197 | } | 200 | } |
198 | 201 | ||
199 | dev_dbg(chan2dev(&td_chan->chan), "desc: %p, addr: %p\n", | 202 | dev_dbg(chan2dev(&td_chan->chan), "desc: %p, addr: %p\n", |
200 | dma_desc, (void *)(int)sg_dma_address(sg)); | 203 | dma_desc, (void *)sg_dma_address(sg)); |
201 | 204 | ||
202 | dma_desc[7] = (sg_dma_address(sg) >> 24) & 0xff; | 205 | dma_desc[7] = (sg_dma_address(sg) >> 24) & 0xff; |
203 | dma_desc[6] = (sg_dma_address(sg) >> 16) & 0xff; | 206 | dma_desc[6] = (sg_dma_address(sg) >> 16) & 0xff; |