diff --git a/[refs] b/[refs]
index b4596f63481f..a096d62d446f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 668ff9ab45d595222d3f90d7974ccba3518e3bb3
+refs/heads/master: 0b6585ce05f169f10ce74329e87bd8c5070b4bb9
diff --git a/trunk/drivers/mtd/mtdchar.c b/trunk/drivers/mtd/mtdchar.c
index 5fff04f3303d..5b081cb84351 100644
--- a/trunk/drivers/mtd/mtdchar.c
+++ b/trunk/drivers/mtd/mtdchar.c
@@ -839,7 +839,7 @@ static long mtd_compat_ioctl(struct file *file, unsigned int cmd,
 	struct inode *inode = file->f_path.dentry->d_inode;
 	struct mtd_file_info *mfi = file->private_data;
 	struct mtd_info *mtd = mfi->mtd;
-	void __user *argp = (void __user *)arg;
+	void __user *argp = compat_ptr(arg);
 	int ret = 0;
 
 	lock_kernel();
@@ -874,7 +874,7 @@ static long mtd_compat_ioctl(struct file *file, unsigned int cmd,
 		break;
 	}
 	default:
-		ret = mtd_ioctl(inode, file, cmd, arg);
+		ret = mtd_ioctl(inode, file, cmd, (unsigned long)argp);
 	}
 
 	unlock_kernel();