1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 2147e733533b..250798cf76aa 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -889,25 +889,26 @@ static int mtdchar_ioctl(struct file *file, u_int cmd, u_long arg)
         case OTPGETREGIONINFO:
         {
                 struct otp_info *buf = kmalloc(4096, GFP_KERNEL);
+                size_t retlen;
                 if (!buf)
                         return -ENOMEM;
                 switch (mfi->mode) {
                 case MTD_FILE_MODE_OTP_FACTORY:
-                        ret = mtd_get_fact_prot_info(mtd, buf, 4096);
+                        ret = mtd_get_fact_prot_info(mtd, 4096, &retlen, buf);
                         break;
                 case MTD_FILE_MODE_OTP_USER:
-                        ret = mtd_get_user_prot_info(mtd, buf, 4096);
+                        ret = mtd_get_user_prot_info(mtd, 4096, &retlen, buf);
                         break;
                 default:
                         ret = -EINVAL;
                         break;
                 }
-                if (ret >= 0) {
+                if (!ret) {
                         if (cmd == OTPGETREGIONCOUNT) {
-                                int nbr = ret / sizeof(struct otp_info);
+                                int nbr = retlen / sizeof(struct otp_info);
                                 ret = copy_to_user(argp, &nbr, sizeof(int));
                         } else
-                                ret = copy_to_user(argp, buf, ret);
+                                ret = copy_to_user(argp, buf, retlen);
                         if (ret)
                                 ret = -EFAULT;
                 }