X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fnet%2Fhamradio%2F6pack.c;h=e6dba5623add40ba8613f9217c4203b2981aff5a;hb=9bf4aaab3e101692164d49b7ca357651eb691cb6;hp=f5b9af0ae8a86beda80c4894045783f46965fd79;hpb=db216c3d5e4c040e557a50f8f5d35d5c415e8c1c;p=linux-2.6.git

diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index f5b9af0ae..e6dba5623 100644
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -731,7 +731,7 @@ static void sixpack_close(struct tty_struct *tty)
 
 	write_lock(&disc_data_lock);
 	sp = tty->disc_data;
-	tty->disc_data = 0;
+	tty->disc_data = NULL;
 	write_unlock(&disc_data_lock);
 	if (sp == 0)
 		return;
@@ -750,7 +750,7 @@ static void sixpack_close(struct tty_struct *tty)
 	unregister_netdev(sp->dev);
 }
 
-static int sp_set_mac_address(struct net_device *dev, void *addr)
+static int sp_set_mac_address(struct net_device *dev, void __user *addr)
 {
 	return copy_from_user(dev->dev_addr, addr, AX25_ADDR_LEN) ? -EFAULT : 0;
 }
@@ -767,16 +767,16 @@ static int sixpack_ioctl(struct tty_struct *tty, struct file *file,
 
 	switch(cmd) {
 	case SIOCGIFNAME:
-		err = copy_to_user((void *) arg, sp->dev->name,
+		err = copy_to_user((void __user *) arg, sp->dev->name,
 		                   strlen(sp->dev->name) + 1) ? -EFAULT : 0;
 		break;
 
 	case SIOCGIFENCAP:
-		err = put_user(0, (int *)arg);
+		err = put_user(0, (int __user *)arg);
 		break;
 
 	case SIOCSIFENCAP:
-		if (get_user(tmp, (int *) arg)) {
+		if (get_user(tmp, (int __user *) arg)) {
 			err = -EFAULT;
 			break;
 		}
@@ -790,7 +790,7 @@ static int sixpack_ioctl(struct tty_struct *tty, struct file *file,
 		break;
 
 	 case SIOCSIFHWADDR:
-		err = sp_set_mac_address(sp->dev, (void *) arg);
+		err = sp_set_mac_address(sp->dev, (void __user *) arg);
 		break;
 
 	/* Allow stty to read, but not set, the serial port */