From 541098d1eacb0b3ba8451532250c5a15982db024 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Fri, 20 Oct 2006 19:51:46 -0700 Subject: [PATCH] --- yaml --- r: 40194 b: refs/heads/master c: 69c3014763966b0ae2bd190dac3654dd6cebdd45 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/atm/nicstar.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 49010da2458b..c4994cd41b7c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 663bab6fd097c18ae0c7a7fd1b4a44558b998cdb +refs/heads/master: 69c3014763966b0ae2bd190dac3654dd6cebdd45 diff --git a/trunk/drivers/atm/nicstar.c b/trunk/drivers/atm/nicstar.c index 632ede552761..bd0904594805 100644 --- a/trunk/drivers/atm/nicstar.c +++ b/trunk/drivers/atm/nicstar.c @@ -2759,7 +2759,7 @@ static int ns_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg) { ns_dev *card; pool_levels pl; - int btype; + long btype; unsigned long flags; card = dev->dev_data; @@ -2859,7 +2859,7 @@ static int ns_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg) case NS_ADJBUFLEV: if (!capable(CAP_NET_ADMIN)) return -EPERM; - btype = (int) arg; /* an int is the same size as a pointer */ + btype = (long) arg; /* a long is the same size as a pointer or bigger */ switch (btype) { case NS_BUFTYPE_SMALL: