aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlan Cox <alan@redhat.com>2006-10-20 22:51:46 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2006-10-21 22:55:25 -0400
commit69c3014763966b0ae2bd190dac3654dd6cebdd45 (patch)
tree50462b7ed2232900365eb11cb0ed310e8b438579 /drivers
parent663bab6fd097c18ae0c7a7fd1b4a44558b998cdb (diff)
[ATM] nicstar: Fix a bogus casting warning
Not enough to make Nicstar 64bit friendly but got squashed in passing so might as well be applied Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/atm/nicstar.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
index 632ede552761..bd0904594805 100644
--- a/drivers/atm/nicstar.c
+++ b/drivers/atm/nicstar.c
@@ -2759,7 +2759,7 @@ static int ns_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
2759{ 2759{
2760 ns_dev *card; 2760 ns_dev *card;
2761 pool_levels pl; 2761 pool_levels pl;
2762 int btype; 2762 long btype;
2763 unsigned long flags; 2763 unsigned long flags;
2764 2764
2765 card = dev->dev_data; 2765 card = dev->dev_data;
@@ -2859,7 +2859,7 @@ static int ns_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
2859 case NS_ADJBUFLEV: 2859 case NS_ADJBUFLEV:
2860 if (!capable(CAP_NET_ADMIN)) 2860 if (!capable(CAP_NET_ADMIN))
2861 return -EPERM; 2861 return -EPERM;
2862 btype = (int) arg; /* an int is the same size as a pointer */ 2862 btype = (long) arg; /* a long is the same size as a pointer or bigger */
2863 switch (btype) 2863 switch (btype)
2864 { 2864 {
2865 case NS_BUFTYPE_SMALL: 2865 case NS_BUFTYPE_SMALL: