Message ID | 20180321131235.9822-3-miquel.raynal@bootlin.com |
---|---|
State | Changes Requested |
Delegated to: | Boris Brezillon |
Headers | show |
Series | Uniform way to pass a NAND ID table to the core | expand |
diff --git a/drivers/mtd/nand/raw/sm_common.c b/drivers/mtd/nand/raw/sm_common.c index 7f5044a79f01..ac93fae5ed27 100644 --- a/drivers/mtd/nand/raw/sm_common.c +++ b/drivers/mtd/nand/raw/sm_common.c @@ -168,8 +168,9 @@ int sm_register_device(struct mtd_info *mtd, int smartmedia) chip->options |= NAND_SKIP_BBTSCAN; /* Scan for card properties */ - ret = nand_scan_ident(mtd, 1, smartmedia ? - nand_smartmedia_flash_ids : nand_xd_flash_ids); + chip->flash_ids = smartmedia ? nand_smartmedia_flash_ids : + nand_xd_flash_ids; + ret = nand_scan_ident(mtd, 1, NULL); if (ret) return ret;
Use the new entry in nand_chip to fill a local ID table instead of the traditional way through nand_scan_ident() as part of the transition to use nand_scan() in every driver. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> --- drivers/mtd/nand/raw/sm_common.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)