---

yaml --- r: 27786 b: refs/heads/master c: 155285c h: refs/heads/master v: v3
git-mirror · May 16, 2006 · 817ca4c · 817ca4c
1 parent e3e1a58
commit 817ca4c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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 */