From: Brian Norris <computersforpeace@gmail.com>
Date: Wed, 30 Nov 2016 02:28:30 +0000 (-0800)
Subject: Merge tag 'nand/for-4.10' of github.com:linux-nand/linux
X-Git-Tag: v4.10-rc1~61^2~4
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=0989b0909c1f86b8a4a76c0bee101cd017c4e259

Merge tag 'nand/for-4.10' of github.com:linux-nand/linux

From Boris Brezillon:

"""
This pull request contains the following notable changes:
- new tango NAND controller driver
- new ox820 NAND controller driver
- addition of a new full-ID entry in the nand_ids table
- rework of the s3c240 driver to support DT
- extension of the nand_sdr_timings to expose tCCS, tPROG and tR
- addition of a new flag to ask the core to wait for tCCS when sending
  a RNDIN/RNDOUT command
- addition of a new flag to ask the core to let the controller driver
  send the READ/PROGPAGE command

This pull request also contains minor fixes/cleanup/cosmetic changes:
- properly support 512 ECC step size in the sunxi driver
- improve the error messages in the pxa probe path
- fix module autoload in the omap2 driver
- cleanup of several nand drivers to return nand_scan{_tail}() error
  code instead of returning -EIO
- various cleanups in the denali driver
- cleanups in the ooblayout handling (MTD core)
- fix an error check in nandsim
"""
---

0989b0909c1f86b8a4a76c0bee101cd017c4e259
diff --cc drivers/mtd/nand/nand_base.c
index 3bde96a3f7bf,96d242e2fe34..ec1c28aaaf23
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@@ -4336,10 -4349,9 +4359,10 @@@ int nand_scan_ident(struct mtd_info *mt
  		if (!(chip->options & NAND_SCAN_SILENT_NODEV))
  			pr_warn("No NAND device found\n");
  		chip->select_chip(mtd, -1);
- 		return PTR_ERR(type);
+ 		return ret;
  	}
  
 +	/* Initialize the ->data_interface field. */
  	ret = nand_init_data_interface(chip);
  	if (ret)
  		return ret;