diff --git a/[refs] b/[refs]
index e281052595a5..66f06e143088 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c8cfdcbeb1ab0ec7bbd5af1be311b55281154c4
+refs/heads/master: dcc41bc81c872862652d68af8993b9fa32ce56a4
diff --git a/trunk/drivers/mtd/nand/cafe.c b/trunk/drivers/mtd/nand/cafe.c
index 6bcb430b951c..dd274c877b5e 100644
--- a/trunk/drivers/mtd/nand/cafe.c
+++ b/trunk/drivers/mtd/nand/cafe.c
@@ -598,6 +598,10 @@ static int __devinit cafe_nand_probe(struct pci_dev *pdev,
 		cafe->nand.block_bad = cafe_nand_block_bad;
 	}
 	
+	/* Start off by resetting the NAND controller completely */
+	writel(1, cafe->mmio + 0x3034);
+	writel(0, cafe->mmio + 0x3034);
+
 	/* Timings from Marvell's test code (not verified or calculated by us) */
 	writel(0xffffffff, cafe->mmio + CAFE_NAND_IRQ_MASK);
 #if 1