summaryrefslogtreecommitdiff
path: root/drivers/mtd/nand/nand_samsung.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-06-12 09:20:47 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-06-12 09:20:47 +0300
commit7bf1e44f865523aa16e0eb340a82d643da9215b5 (patch)
tree1ddb344169d39413053057d888edbb18dfeed880 /drivers/mtd/nand/nand_samsung.c
parente5770b7bdbfe9f23bb75a7d5a88c1f5e18e20738 (diff)
parent32c1431eea4881a6b17bd7c639315010aeefa452 (diff)
downloadlinux-7bf1e44f865523aa16e0eb340a82d643da9215b5.tar.xz
Merge 4.12-rc5 into staging-next
We want the IIO fixes and other staging driver fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/mtd/nand/nand_samsung.c')
-rw-r--r--drivers/mtd/nand/nand_samsung.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mtd/nand/nand_samsung.c b/drivers/mtd/nand/nand_samsung.c
index 9cfc4035a420..1e0755997762 100644
--- a/drivers/mtd/nand/nand_samsung.c
+++ b/drivers/mtd/nand/nand_samsung.c
@@ -84,6 +84,9 @@ static void samsung_nand_decode_id(struct nand_chip *chip)
case 7:
chip->ecc_strength_ds = 60;
break;
+ default:
+ WARN(1, "Could not decode ECC info");
+ chip->ecc_step_ds = 0;
}
}
} else {