X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fnet%2Fwan%2Fx25_asy.c;h=467ad7b8cd8675fede848d0d3f5601cbbb6c2156;hb=9bf4aaab3e101692164d49b7ca357651eb691cb6;hp=4243fea5354d880986536807146e7639a44b99c0;hpb=db216c3d5e4c040e557a50f8f5d35d5c415e8c1c;p=linux-2.6.git

diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c
index 4243fea53..467ad7b8c 100644
--- a/drivers/net/wan/x25_asy.c
+++ b/drivers/net/wan/x25_asy.c
@@ -627,7 +627,7 @@ static void x25_asy_close_tty(struct tty_struct *tty)
 		(void) dev_close(sl->dev);
 	}
 
-	tty->disc_data = 0;
+	tty->disc_data = NULL;
 	sl->tty = NULL;
 	x25_asy_free(sl);
 }
@@ -733,7 +733,7 @@ static int x25_asy_ioctl(struct tty_struct *tty, struct file *file,
 
 	switch(cmd) {
 	case SIOCGIFNAME:
-		if (copy_to_user((void *)arg, sl->dev->name,
+		if (copy_to_user((void __user *)arg, sl->dev->name,
 					strlen(sl->dev->name) + 1))
 			return -EFAULT;
 		return 0;