From 0cd10096095705048c0cfa894bc09bb421a7fbb4 Mon Sep 17 00:00:00 2001
From: Jiri Pinkava <jiri.pinkava@vscht.cz>
Date: Wed, 13 Apr 2011 12:26:48 +0200
Subject: [PATCH] --- yaml --- r: 252479 b: refs/heads/master c:
 c2aad6d6585c320ed5e111db5e03d27e901dfa81 h: refs/heads/master i:   252477:
 623860282d54f8f52243033217d5b70a3c4cb119   252475:
 1e11b0ac8de3b04254eaf480f0493bee5444cce1   252471:
 deebd9b5213143b6463b82c671edcbd2c73a3459   252463:
 826e899f2523b587c51517a1a835a59cefbdc6ae   252447:
 102abfd8c52953ec592c8deca720fcec82d26802   252415:
 e5875fedb346d082f3b83c05ffb4745810dcb7f0 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/mtd/nand/nand_base.c | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index f0c025add711..910f287beb85 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac497c1602555c908c9738fa93b1145f431d1876
+refs/heads/master: c2aad6d6585c320ed5e111db5e03d27e901dfa81
diff --git a/trunk/drivers/mtd/nand/nand_base.c b/trunk/drivers/mtd/nand/nand_base.c
index c54a4cbac6bc..bc1c2e6ae4a4 100644
--- a/trunk/drivers/mtd/nand/nand_base.c
+++ b/trunk/drivers/mtd/nand/nand_base.c
@@ -976,9 +976,6 @@ int nand_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
 	ret = __nand_unlock(mtd, ofs, len, 0);
 
 out:
-	/* de-select the NAND device */
-	chip->select_chip(mtd, -1);
-
 	nand_release_device(mtd);
 
 	return ret;
@@ -1046,9 +1043,6 @@ int nand_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
 	ret = __nand_unlock(mtd, ofs, len, 0x1);
 
 out:
-	/* de-select the NAND device */
-	chip->select_chip(mtd, -1);
-
 	nand_release_device(mtd);
 
 	return ret;