git.librecmc.org Git - librecmc/librecmc-fossil.git/blob

   1 ---
   2  drivers/mtd/nand/plat_nand.c |   13 ++++++++++++-
   3  include/linux/mtd/nand.h     |    1 +
   4  2 files changed, 13 insertions(+), 1 deletion(-)
   5
   6 --- a/include/linux/mtd/nand.h
   7 +++ b/include/linux/mtd/nand.h
   8 @@ -851,6 +851,7 @@ struct platform_nand_chip {
   9         unsigned int options;
  10         unsigned int bbt_options;
  11         const char **part_probe_types;
  12 +       int (*chip_fixup)(struct mtd_info *mtd);
  13  };
  14
  15  /* Keep gcc happy */
  16 --- a/drivers/mtd/nand/plat_nand.c
  17 +++ b/drivers/mtd/nand/plat_nand.c
  18 @@ -90,7 +90,18 @@ static int plat_nand_probe(struct platfo
  19         }
  20
  21         /* Scan to find existence of the device */
  22 -       if (nand_scan(&data->mtd, pdata->chip.nr_chips)) {
  23 +       if (nand_scan_ident(&data->mtd, pdata->chip.nr_chips, NULL)) {
  24 +               err = -ENXIO;
  25 +               goto out;
  26 +       }
  27 +
  28 +       if (pdata->chip.chip_fixup) {
  29 +               err = pdata->chip.chip_fixup(&data->mtd);
  30 +               if (err)
  31 +                       goto out;
  32 +       }
  33 +
  34 +       if (nand_scan_tail(&data->mtd)) {
  35                 err = -ENXIO;
  36                 goto out;
  37         }