diff --git a/[refs] b/[refs]
index 91b808a734ba..f0a66f8d5e76 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dbf5986aed62620d3dde54e1b63889821c857675
+refs/heads/master: 346e125967c39fc25263f3071dfc88224ae843f4
diff --git a/trunk/drivers/mtd/nand/pxa3xx_nand.c b/trunk/drivers/mtd/nand/pxa3xx_nand.c
index e75b1bf6df12..11f32454fc77 100644
--- a/trunk/drivers/mtd/nand/pxa3xx_nand.c
+++ b/trunk/drivers/mtd/nand/pxa3xx_nand.c
@@ -1244,6 +1244,9 @@ static int pxa3xx_nand_probe(struct platform_device *pdev)
 	if (ret)
 		goto fail_free_io;
 
+	/* initialize all interrupts to be disabled */
+	disable_int(info, NDSR_MASK);
+
 	ret = request_irq(irq, pxa3xx_nand_irq, IRQF_DISABLED,
 			  pdev->name, info);
 	if (ret < 0) {