1 files changed, 16 insertions, 7 deletions

diff --git a/drivers/mtd/tests/torturetest.c b/drivers/mtd/tests/torturetest.c
index b55bc52a1340..e5d6e6d9532f 100644
--- a/drivers/mtd/tests/torturetest.c
+++ b/drivers/mtd/tests/torturetest.c
@@ -101,11 +101,11 @@ static inline int check_eraseblock(int ebnum, unsigned char *buf)
 {
         int err, retries = 0;
         size_t read;
-        loff_t addr = ebnum * mtd->erasesize;
+        loff_t addr = (loff_t)ebnum * mtd->erasesize;
         size_t len = mtd->erasesize;
 
         if (pgcnt) {
-                addr = (ebnum + 1) * mtd->erasesize - pgcnt * pgsize;
+                addr = (loff_t)(ebnum + 1) * mtd->erasesize - pgcnt * pgsize;
                 len = pgcnt * pgsize;
         }
 
@@ -155,11 +155,11 @@ static inline int write_pattern(int ebnum, void *buf)
 {
         int err;
         size_t written;
-        loff_t addr = ebnum * mtd->erasesize;
+        loff_t addr = (loff_t)ebnum * mtd->erasesize;
         size_t len = mtd->erasesize;
 
         if (pgcnt) {
-                addr = (ebnum + 1) * mtd->erasesize - pgcnt * pgsize;
+                addr = (loff_t)(ebnum + 1) * mtd->erasesize - pgcnt * pgsize;
                 len = pgcnt * pgsize;
         }
         err = mtd_write(mtd, addr, len, &written, buf);
@@ -279,7 +279,10 @@ static int __init tort_init(void)
                                                " for 0xFF... pattern\n");
                                         goto out;
                                 }
-                                cond_resched();
+
+                                err = mtdtest_relax();
+                                if (err)
+                                        goto out;
                         }
                 }
 
@@ -294,7 +297,10 @@ static int __init tort_init(void)
                         err = write_pattern(i, patt);
                         if (err)
                                 goto out;
-                        cond_resched();
+
+                        err = mtdtest_relax();
+                        if (err)
+                                goto out;
                 }
 
                 /* Verify what we wrote */
@@ -314,7 +320,10 @@ static int __init tort_init(void)
                                                "0x55AA55..." : "0xAA55AA...");
                                         goto out;
                                 }
-                                cond_resched();
+
+                                err = mtdtest_relax();
+                                if (err)
+                                        goto out;
                         }
                 }