From patchwork Tue Nov 23 20:39:51 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarod Wilson X-Patchwork-Id: 350851 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oANKdwFv027766 for ; Tue, 23 Nov 2010 20:39:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751603Ab0KWUj5 (ORCPT ); Tue, 23 Nov 2010 15:39:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:30102 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751214Ab0KWUj4 (ORCPT ); Tue, 23 Nov 2010 15:39:56 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oANKdrHn028215 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 23 Nov 2010 15:39:53 -0500 Received: from xavier.bos.redhat.com (xavier.bos.redhat.com [10.16.16.50]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oANKdrX7021917; Tue, 23 Nov 2010 15:39:53 -0500 Received: by xavier.bos.redhat.com (Postfix, from userid 500) id 989D581733; Tue, 23 Nov 2010 15:39:52 -0500 (EST) Date: Tue, 23 Nov 2010 15:39:51 -0500 From: Jarod Wilson To: linux-media@vger.kernel.org Cc: Richard =?iso-8859-1?Q?R=F6jfors?= Subject: [PATCH] media: fix casting issues in timberdale logiwin Message-ID: <20101123203951.GA29332@redhat.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 23 Nov 2010 20:39:58 +0000 (UTC) different sizes w/current code, this silences them. Signed-off-by: Jarod Wilson --- drivers/media/video/timblogiw.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/media/video/timblogiw.c b/drivers/media/video/timblogiw.c index 48989e5..4da3625 100644 --- a/drivers/media/video/timblogiw.c +++ b/drivers/media/video/timblogiw.c @@ -148,7 +148,9 @@ 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; + int chan_id = *(int *)filter_param; + + return chan->chan_id == chan_id; } /* IOCTL functions */ @@ -670,7 +672,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 *)(unsigned long)lw->pdata.dma_channel); if (!fh->chan) { dev_err(&vdev->dev, "Failed to get DMA channel\n"); kfree(fh);