diff --git a/[refs] b/[refs]
index be3f6cf765f6..8d1c9ebfc913 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de5d4453c5b224eefd02b6a141ed411a76d458af
+refs/heads/master: 0f65169b1bf44220308e1ce1f6666ad03ddc27af
diff --git a/trunk/drivers/dma/timb_dma.c b/trunk/drivers/dma/timb_dma.c
index 4dd710246c79..145f1c23408f 100644
--- a/trunk/drivers/dma/timb_dma.c
+++ b/trunk/drivers/dma/timb_dma.c
@@ -79,7 +79,10 @@ struct timb_dma_desc {
 struct timb_dma_chan {
 	struct dma_chan		chan;
 	void __iomem		*membase;
-	spinlock_t		lock; /* Used for mutual exclusion */
+	spinlock_t		lock; /* Used to protect data structures,
+					especially the lists and descriptors,
+					from races between the tasklet and calls
+					from above */
 	dma_cookie_t		last_completed_cookie;
 	bool			ongoing;
 	struct list_head	active_list;
@@ -197,7 +200,7 @@ static int td_fill_desc(struct timb_dma_chan *td_chan, u8 *dma_desc,
 	}
 
 	dev_dbg(chan2dev(&td_chan->chan), "desc: %p, addr: %p\n",
-		dma_desc, (void *)(int)sg_dma_address(sg));
+		dma_desc, (void *)sg_dma_address(sg));
 
 	dma_desc[7] = (sg_dma_address(sg) >> 24) & 0xff;
 	dma_desc[6] = (sg_dma_address(sg) >> 16) & 0xff;