From bfa42eeb10cf445f4ebfe3179b28debcbcfffa9c Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Wed, 29 Dec 2010 14:38:44 -0300 Subject: [PATCH] --- yaml --- r: 226398 b: refs/heads/master c: 61ea3aa5bf309333c6655ccef825b4a765bff219 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/timblogiw.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0fe6d005bdf5..1f13f9507ad3 100644 --- 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 index c2fcab465dfc..fc611ebeb82c 100644 --- 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);