From 817ca4c2d8f57044e19ebf6e45ce9119ffe20e00 Mon Sep 17 00:00:00 2001
From: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date: Tue, 16 May 2006 20:16:41 +0400
Subject: [PATCH] --- yaml --- r: 27786 b: refs/heads/master c:
 155285c4775b7027b01a5b744c721ae43cced798 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 9bd1237c4e0e..5ae3d1b880bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c41ff6e5f38b02ff927d0d510e28dc1392bb4690
+refs/heads/master: 155285c4775b7027b01a5b744c721ae43cced798
diff --git a/trunk/drivers/mtd/nand/au1550nd.c b/trunk/drivers/mtd/nand/au1550nd.c
index 861fb961d942..839b35a386b6 100644
--- a/trunk/drivers/mtd/nand/au1550nd.c
+++ b/trunk/drivers/mtd/nand/au1550nd.c
@@ -347,11 +347,9 @@ static int __init au1xxx_nand_init(void)
 	au1550_mtd->priv = this;
 	au1550_mtd->owner = THIS_MODULE;
 
-	/* disable interrupts */
-	au_writel(au_readl(MEM_STNDCTL) & ~(1 << 8), MEM_STNDCTL);
 
-	/* disable NAND boot */
-	au_writel(au_readl(MEM_STNDCTL) & ~(1 << 0), MEM_STNDCTL);
+	/* MEM_STNDCTL: disable ints, disable nand boot */
+	au_writel(0, MEM_STNDCTL);
 
 #ifdef CONFIG_MIPS_PB1550
 	/* set gpio206 high */