git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
atm
/
suni.c
diff --git
a/drivers/atm/suni.c
b/drivers/atm/suni.c
index
e5a0f5c
..
b1d063c
100644
(file)
--- a/
drivers/atm/suni.c
+++ b/
drivers/atm/suni.c
@@
-48,7
+48,7
@@
struct suni_priv {
static struct timer_list poll_timer;
static struct suni_priv *sunis = NULL;
static struct timer_list poll_timer;
static struct suni_priv *sunis = NULL;
-static
spinlock_t sunis_lock = SPIN_LOCK_UNLOCKED
;
+static
DEFINE_SPINLOCK(sunis_lock)
;
#define ADD_LIMITED(s,v) \
#define ADD_LIMITED(s,v) \
@@
-188,7
+188,7
@@
static int suni_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
case SONET_GETDIAG:
return get_diag(dev,arg);
case SONET_SETFRAMING:
case SONET_GETDIAG:
return get_diag(dev,arg);
case SONET_SETFRAMING:
- if (arg != SONET_FRAME_SONET) return -EINVAL;
+ if (
(int)(unsigned long)
arg != SONET_FRAME_SONET) return -EINVAL;
return 0;
case SONET_GETFRAMING:
return put_user(SONET_FRAME_SONET,(int __user *)arg) ?
return 0;
case SONET_GETFRAMING:
return put_user(SONET_FRAME_SONET,(int __user *)arg) ?
@@
-196,7
+196,7
@@
static int suni_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
case SONET_GETFRSENSE:
return -EINVAL;
case ATM_SETLOOP:
case SONET_GETFRSENSE:
return -EINVAL;
case ATM_SETLOOP:
- return set_loopback(dev,(int)
(long)
arg);
+ return set_loopback(dev,(int)
(unsigned long)
arg);
case ATM_GETLOOP:
return put_user(PRIV(dev)->loop_mode,(int __user *)arg) ?
-EFAULT : 0;
case ATM_GETLOOP:
return put_user(PRIV(dev)->loop_mode,(int __user *)arg) ?
-EFAULT : 0;