aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Pinkava <jiri.pinkava@vscht.cz>2011-04-13 06:26:48 -0400
committerDavid Woodhouse <David.Woodhouse@intel.com>2011-05-24 20:53:22 -0400
commitc2aad6d6585c320ed5e111db5e03d27e901dfa81 (patch)
tree6ff07379db9af9804634e2b894037f7322184006
parentac497c1602555c908c9738fa93b1145f431d1876 (diff)
mtd: nand: remove doubled chip deselection on (un)lock
Chip deselection is already done in nand_release_device. So only duplicate code. Signed-off-by: Jiri Pinkava <jiri.pinkava@vscht.cz> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
-rw-r--r--drivers/mtd/nand/nand_base.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index c54a4cbac6bc..bc1c2e6ae4a4 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -976,9 +976,6 @@ int nand_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
976 ret = __nand_unlock(mtd, ofs, len, 0); 976 ret = __nand_unlock(mtd, ofs, len, 0);
977 977
978out: 978out:
979 /* de-select the NAND device */
980 chip->select_chip(mtd, -1);
981
982 nand_release_device(mtd); 979 nand_release_device(mtd);
983 980
984 return ret; 981 return ret;
@@ -1046,9 +1043,6 @@ int nand_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
1046 ret = __nand_unlock(mtd, ofs, len, 0x1); 1043 ret = __nand_unlock(mtd, ofs, len, 0x1);
1047 1044
1048out: 1045out:
1049 /* de-select the NAND device */
1050 chip->select_chip(mtd, -1);
1051
1052 nand_release_device(mtd); 1046 nand_release_device(mtd);
1053 1047
1054 return ret; 1048 return ret;