---

yaml --- r: 226398 b: refs/heads/master c: 61ea3aa h: refs/heads/master v: v3
git-mirror · Dec 30, 2010 · bfa42ee · bfa42ee
1 parent 3555ecb
commit bfa42ee
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 657f2271050beabe725ba101c1d840f51a41f33d
+refs/heads/master: 61ea3aa5bf309333c6655ccef825b4a765bff219
diff --git a/trunk/drivers/media/video/timblogiw.c b/trunk/drivers/media/video/timblogiw.c
@@ -148,7 +148,7 @@ static void timblogiw_dma_cb(void *data)
 
 static bool timblogiw_dma_filter_fn(struct dma_chan *chan, void *filter_param)
 {
-	return chan->chan_id == (int)filter_param;
+	return chan->chan_id == (uintptr_t)filter_param;
 }
 
 /* IOCTL functions */
@@ -668,7 +668,7 @@ static int timblogiw_open(struct file *file)
 
 	/* find the DMA channel */
 	fh->chan = dma_request_channel(mask, timblogiw_dma_filter_fn,
-			(void *)lw->pdata.dma_channel);
+			(void *)(uintptr_t)lw->pdata.dma_channel);
 	if (!fh->chan) {
 		dev_err(&vdev->dev, "Failed to get DMA channel\n");
 		kfree(fh);