From: Boris BREZILLON <boris.brezillon@free-electrons.com>
Date: Mon, 23 Nov 2015 10:23:07 +0000 (+0100)
Subject: mtd: nand: fix ONFI parameter page layout
X-Git-Tag: v3.16.35~543
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ff67fea741c57084f7b4be22dcddc929ef9f3334;p=thirdparty%2Fkernel%2Fstable.git

mtd: nand: fix ONFI parameter page layout

commit de64aa9ec129ba627634088f662a4d09e356ddb6 upstream.

src_ssync_features field is only 1 byte large, and the 4th reserved area
is actually 8 bytes large.

Fixes: d1e1f4e42b5 ("mtd: nand: add support for reading ONFI parameters from NAND device")
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---

diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index c498acebd8bb0..2b468f73f53dd 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -274,7 +274,7 @@ struct nand_onfi_params {
 	__le16 t_r;
 	__le16 t_ccs;
 	__le16 src_sync_timing_mode;
-	__le16 src_ssync_features;
+	u8 src_ssync_features;
 	__le16 clk_pin_capacitance_typ;
 	__le16 io_pin_capacitance_typ;
 	__le16 input_pin_capacitance_typ;
@@ -282,7 +282,7 @@ struct nand_onfi_params {
 	u8 driver_strength_support;
 	__le16 t_int_r;
 	__le16 t_ald;
-	u8 reserved4[7];
+	u8 reserved4[8];
 
 	/* vendor */
 	__le16 vendor_revision;