spi: atcspi200: avoid NULL dereference

[u-boot] / common / fb_nand.c

diff --git a/common/fb_nand.c b/common/fb_nand.c
index c8c79e92383762138294f1124c58ade2cb329902..c07655e49ed8ec10d6143b165855f70b55494d55 100644 (file)
--- a/common/fb_nand.c
+++ b/common/fb_nand.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2014 Broadcom Corporation.
  * Copyright 2015 Free Electrons.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <config.h>
@@ -40,26 +39,26 @@ static int fb_nand_lookup(const char *partname,
 
        ret = mtdparts_init();
        if (ret) {
-               error("Cannot initialize MTD partitions\n");
+               pr_err("Cannot initialize MTD partitions\n");
                fastboot_fail("cannot init mtdparts");
                return ret;
        }
 
        ret = find_dev_and_part(partname, &dev, &pnum, part);
        if (ret) {
-               error("cannot find partition: '%s'", partname);
+               pr_err("cannot find partition: '%s'", partname);
                fastboot_fail("cannot find partition");
                return ret;
        }
 
        if (dev->id->type != MTD_DEV_TYPE_NAND) {
-               error("partition '%s' is not stored on a NAND device",
+               pr_err("partition '%s' is not stored on a NAND device",
                      partname);
                fastboot_fail("not a NAND device");
                return -EINVAL;
        }
 
-       *mtd = nand_info[dev->id->num];
+       *mtd = get_nand_dev_by_index(dev->id->num);
 
        return 0;
 }
@@ -154,7 +153,7 @@ void fb_nand_flash_write(const char *cmd, void *download_buffer,
 
        ret = fb_nand_lookup(cmd, &mtd, &part);
        if (ret) {
-               error("invalid NAND device");
+               pr_err("invalid NAND device");
                fastboot_fail("invalid NAND device");
                return;
        }
@@ -175,13 +174,15 @@ void fb_nand_flash_write(const char *cmd, void *download_buffer,
                sparse.size = part->size / sparse.blksz;
                sparse.write = fb_nand_sparse_write;
                sparse.reserve = fb_nand_sparse_reserve;
+               sparse.mssg = fastboot_fail;
 
                printf("Flashing sparse image at offset " LBAFU "\n",
                       sparse.start);
 
                sparse.priv = &sparse_priv;
-               write_sparse_image(&sparse, cmd, download_buffer,
-                                  download_bytes);
+               ret = write_sparse_image(&sparse, cmd, download_buffer);
+               if (!ret)
+                       fastboot_okay("");
        } else {
                printf("Flashing raw image at offset 0x%llx\n",
                       part->offset);
@@ -209,7 +210,7 @@ void fb_nand_erase(const char *cmd)
 
        ret = fb_nand_lookup(cmd, &mtd, &part);
        if (ret) {
-               error("invalid NAND device");
+               pr_err("invalid NAND device");
                fastboot_fail("invalid NAND device");
                return;
        }
@@ -220,7 +221,7 @@ void fb_nand_erase(const char *cmd)
 
        ret = _fb_nand_erase(mtd, part);
        if (ret) {
-               error("failed erasing from device %s", mtd->name);
+               pr_err("failed erasing from device %s", mtd->name);
                fastboot_fail("failed erasing from device");
                return;
        }