VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / drivers / sbus / char / display7seg.c

diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c
index 8d1a1e1..e8ac0b4 100644 (file)
--- a/drivers/sbus/char/display7seg.c
+++ b/drivers/sbus/char/display7seg.c
@@ -70,7 +70,7 @@ MODULE_SUPPORTED_DEVICE
  * FLIP                - Inverts display for upside-down mounted board
  * bits 0-4    - 7-segment display contents
  */
-volatile u8* d7s_regs = 0;
+volatile u8* d7s_regs = NULL;
 
 static inline void d7s_free(void)
 {
@@ -128,7 +128,7 @@ static int d7s_ioctl(struct inode *inode, struct file *f,
                /* assign device register values
                 * we mask-out D7S_FLIP if in sol_compat mode
                 */
-               if (get_user(ireg, (int *) arg))
+               if (get_user(ireg, (int __user *) arg))
                        return -EFAULT;
                if (0 != sol_compat) {
                        (regs & D7S_FLIP) ? 
@@ -144,7 +144,7 @@ static int d7s_ioctl(struct inode *inode, struct file *f,
                 * This driver will not misinform you about the state
                 * of your hardware while in sol_compat mode
                 */
-               if (put_user(regs, (int *) arg))
+               if (put_user(regs, (int __user *) arg))
                        return -EFAULT;
                break;