diff options
author | Scott Wood <oss@buserror.net> | 2016-05-30 13:57:58 -0500 |
---|---|---|
committer | Scott Wood <oss@buserror.net> | 2016-06-03 20:27:48 -0500 |
commit | ceee07b65875bb01bef55cba06940ef7afc1afba (patch) | |
tree | 114c79852874d1970e91ff76f80835ce25038baa /drivers/mtd/nand/omap_gpmc.c | |
parent | 81c772521ff26054a3fe75efa87d8daeae83e9b4 (diff) | |
download | blackbird-obmc-uboot-ceee07b65875bb01bef55cba06940ef7afc1afba.tar.gz blackbird-obmc-uboot-ceee07b65875bb01bef55cba06940ef7afc1afba.zip |
mtd: nand: Sync with Linux v4.6
Updates the NAND code to match Linux v4.6. The previous sync was from
Linux v4.1 in commit d3963721d93fafa.
Note that none of the individual NAND drivers tracked Linux closely
enough to be synced themselves, other than manually applying a few
cross-tree changes.
Signed-off-by: Scott Wood <oss@buserror.net>
Tested-by: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'drivers/mtd/nand/omap_gpmc.c')
-rw-r--r-- | drivers/mtd/nand/omap_gpmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/omap_gpmc.c b/drivers/mtd/nand/omap_gpmc.c index cac9eea2c1..37c4341763 100644 --- a/drivers/mtd/nand/omap_gpmc.c +++ b/drivers/mtd/nand/omap_gpmc.c @@ -163,7 +163,7 @@ static int __maybe_unused omap_correct_data(struct mtd_info *mtd, uint8_t *dat, return 0; printf("Error: Bad compare! failed\n"); /* detected 2 bit error */ - return -1; + return -EBADMSG; } } return 0; |