From 04a87d7cc8895f77fa2c739fff8287a095eadf17 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@cruncher.tec.linutronix.de>
Date: Wed, 28 Jun 2006 00:11:45 +0200
Subject: [PATCH] --- yaml --- r: 30943 b: refs/heads/master c:
 6a93096195305f6f2a39544a034e77e2e74d5799 h: refs/heads/master i:   30941:
 ad744dd87da177c5b1157c49e1f996df46ee5bfb   30939:
 c7ed1780c83acd27bc58756611cfaeef2f68f1ad   30935:
 f746319f81180b14ccdf6b5e5337d9d3b6b55ec8   30927:
 1118c25652b77cdf3c50dc775808cce3f814de49   30911:
 35b02d721e4363f2c2e3f2ddb5df8d3858791bec v: v3

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

diff --git a/[refs] b/[refs]
index 5000fc73d2aa..8978027acb83 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1887f517e3cdf5f1e9c0e4daaa864450415a8f61
+refs/heads/master: 6a93096195305f6f2a39544a034e77e2e74d5799
diff --git a/trunk/drivers/mtd/nand/nand_base.c b/trunk/drivers/mtd/nand/nand_base.c
index 8df184f6d8d1..80a76654d963 100644
--- a/trunk/drivers/mtd/nand/nand_base.c
+++ b/trunk/drivers/mtd/nand/nand_base.c
@@ -1610,13 +1610,13 @@ static int nand_do_write_ops(struct mtd_info *mtd, loff_t to,
 	if (!writelen)
 		return 0;
 
+	chipnr = (int)(to >> chip->chip_shift);
+	chip->select_chip(mtd, chipnr);
+
 	/* Check, if it is write protected */
 	if (nand_check_wp(mtd))
 		return -EIO;
 
-	chipnr = (int)(to >> chip->chip_shift);
-	chip->select_chip(mtd, chipnr);
-
 	realpage = (int)(to >> chip->page_shift);
 	page = realpage & chip->pagemask;
 	blockmask = (1 << (chip->phys_erase_shift - chip->page_shift)) - 1;