Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[karo-tx-linux.git] / drivers / net / ks8842.c

diff --git a/drivers/net/ks8842.c b/drivers/net/ks8842.c
index 3fe38c787f29d8aecfe0c2a307a0d94377189f80..928b2b83cef509080c30eccd6c4d1c4cfe76fd58 100644 (file)
--- a/drivers/net/ks8842.c
+++ b/drivers/net/ks8842.c
@@ -919,7 +919,7 @@ static void ks8842_dealloc_dma_bufs(struct ks8842_adapter *adapter)
 
 static bool ks8842_dma_filter_fn(struct dma_chan *chan, void *filter_param)
 {
-       return chan->chan_id == (int)filter_param;
+       return chan->chan_id == (long)filter_param;
 }
 
 static int ks8842_alloc_dma_bufs(struct net_device *netdev)
@@ -938,7 +938,7 @@ static int ks8842_alloc_dma_bufs(struct net_device *netdev)
        sg_init_table(&tx_ctl->sg, 1);
 
        tx_ctl->chan = dma_request_channel(mask, ks8842_dma_filter_fn,
-               (void *)tx_ctl->channel);
+                                          (void *)(long)tx_ctl->channel);
        if (!tx_ctl->chan) {
                err = -ENODEV;
                goto err;
@@ -961,7 +961,7 @@ static int ks8842_alloc_dma_bufs(struct net_device *netdev)
        }
 
        rx_ctl->chan = dma_request_channel(mask, ks8842_dma_filter_fn,
-               (void *)rx_ctl->channel);
+                                          (void *)(long)rx_ctl->channel);
        if (!rx_ctl->chan) {
                err = -ENODEV;
                goto err;