drivers/mtd/devices/m25p80.c: Fix return code of read/write mtd callbacks

@@ -199,7 +199,7 @@
 
     } while (!time_after_eq(jiffies, deadline));
 
-    return 1;
+    return -EBUSY;
 }
 
 /*

@@ -209,12 +209,15 @@
  */
 static int erase_chip(struct m25p *flash)
 {
+    int    ret;
+
     pr_debug("%s: %s %lldKiB\n", dev_name(&flash->spi->dev), __func__,
             (long long)(flash->mtd.size >> 10));
 
     /* Wait until finished previous write command. */
-    if (wait_till_ready(flash))
-        return 1;
+    ret = wait_till_ready(flash);
+    if (ret)
+        return ret;
 
     /* Send write enable, then erase commands. */
     write_enable(flash);

@@ -249,12 +252,15 @@
  */
 static int erase_sector(struct m25p *flash, u32 offset)
 {
+    int    ret;
+
     pr_debug("%s: %s %dKiB at 0x%08x\n", dev_name(&flash->spi->dev),
             __func__, flash->mtd.erasesize / 1024, offset);
 
     /* Wait until finished previous write command. */
-    if (wait_till_ready(flash))
-        return 1;
+    ret = wait_till_ready(flash);
+    if (ret)
+        return ret;
 
     /* Send write enable, then erase commands. */
     write_enable(flash);

@@ -283,6 +289,7 @@
     struct m25p *flash = mtd_to_m25p(mtd);
     u32 addr,len;
     uint32_t rem;
+    int ret;
 
     pr_debug("%s: %s at 0x%llx, len %lld\n", dev_name(&flash->spi->dev),
             __func__, (long long)instr->addr,

@@ -299,10 +306,11 @@
 
     /* whole-chip erase? */
     if (len == flash->mtd.size) {
-        if (erase_chip(flash)) {
+        ret = erase_chip(flash);
+        if (ret) {
             instr->state = MTD_ERASE_FAILED;
             mutex_unlock(&flash->lock);
-            return -EIO;
+            return ret;
         }
 
     /* REVISIT in some cases we could speed up erasing large regions

@@ -313,10 +321,11 @@
     /* "sector"-at-a-time erase */
     } else {
         while (len) {
-            if (erase_sector(flash, addr)) {
+            ret = erase_sector(flash, addr);
+            if (ret) {
                 instr->state = MTD_ERASE_FAILED;
                 mutex_unlock(&flash->lock);
-                return -EIO;
+                return ret;
             }
 
             addr += mtd->erasesize;

@@ -339,6 +348,7 @@
 static int m25p80_read(struct mtd_info *mtd, loff_t from, size_t len,
     size_t *retlen, u_char *buf)
 {
+    int ret;
     struct m25p *flash = mtd_to_m25p(mtd);
     struct spi_transfer t[2];
     struct spi_message m;

@@ -364,10 +374,11 @@
     mutex_lock(&flash->lock);
 
     /* Wait till previous write/erase is done. */
-    if (wait_till_ready(flash)) {
+    ret = wait_till_ready(flash);
+    if (ret) {
         /* REVISIT status return?? */
         mutex_unlock(&flash->lock);
-        return 1;
+        return ret;
     }
 
     /* FIXME switch to OPCODE_FAST_READ.  It's required for higher

@@ -396,6 +407,7 @@
 static int m25p80_write(struct mtd_info *mtd, loff_t to, size_t len,
     size_t *retlen, const u_char *buf)
 {
+    int ret;
     struct m25p *flash = mtd_to_m25p(mtd);
     u32 page_offset, page_size;
     struct spi_transfer t[2];

@@ -417,9 +429,10 @@
     mutex_lock(&flash->lock);
 
     /* Wait until finished previous write command. */
-    if (wait_till_ready(flash)) {
+    ret = wait_till_ready(flash);
+    if (ret) {
         mutex_unlock(&flash->lock);
-        return 1;
+        return ret;
     }
 
     write_enable(flash);