diff --git a/[refs] b/[refs]
index fa62894bc47f..dde93c7b853e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 21535ab39a74b5ec074e2d10b132e866472e86f9
+refs/heads/master: d5842ab730d368ae2e8925dc00aec0ca132b72ab
diff --git a/trunk/drivers/mtd/nand/lpc32xx_slc.c b/trunk/drivers/mtd/nand/lpc32xx_slc.c
index 116665015269..1719387dd008 100644
--- a/trunk/drivers/mtd/nand/lpc32xx_slc.c
+++ b/trunk/drivers/mtd/nand/lpc32xx_slc.c
@@ -821,6 +821,8 @@ static int __devinit lpc32xx_nand_probe(struct platform_device *pdev)
 		dev_err(&pdev->dev, "Missing platform data\n");
 		return -ENOENT;
 	}
+	if (host->ncfg->wp_gpio == -EPROBE_DEFER)
+		return -EPROBE_DEFER;
 	if (gpio_is_valid(host->ncfg->wp_gpio) &&
 			gpio_request(host->ncfg->wp_gpio, "NAND WP")) {
 		dev_err(&pdev->dev, "GPIO not available\n");