X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fvideo%2Fcg14.c;h=e0fc4c02c3bf80d14fb559e3ba36306c24bd4bbd;hb=9bf4aaab3e101692164d49b7ca357651eb691cb6;hp=40d28baf46c200ee018637f92fcdb26e565dd6c0;hpb=db216c3d5e4c040e557a50f8f5d35d5c415e8c1c;p=linux-2.6.git

diff --git a/drivers/video/cg14.c b/drivers/video/cg14.c
index 40d28baf4..e0fc4c02c 100644
--- a/drivers/video/cg14.c
+++ b/drivers/video/cg14.c
@@ -278,7 +278,7 @@ static int cg14_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
 {
 	struct cg14_par *par = (struct cg14_par *) info->par;
 	struct cg14_regs *regs = par->regs;
-	struct mdi_cfginfo kmdi, *mdii;
+	struct mdi_cfginfo kmdi, __user *mdii;
 	unsigned long flags;
 	int cur_mode, mode, ret = 0;
 
@@ -301,13 +301,13 @@ static int cg14_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
 		kmdi.mdi_size = par->ramsize;
 		spin_unlock_irqrestore(&par->lock, flags);
 
-		mdii = (struct mdi_cfginfo *) arg;
+		mdii = (struct mdi_cfginfo __user *) arg;
 		if (copy_to_user(mdii, &kmdi, sizeof(kmdi)))
 			ret = -EFAULT;
 		break;
 
 	case MDI_SET_PIXELMODE:
-		if (get_user(mode, (int *) arg)) {
+		if (get_user(mode, (int __user *) arg)) {
 			ret = -EFAULT;
 			break;
 		}