From 1acf9e199c675256e6e1396000f8b4f099233097 Mon Sep 17 00:00:00 2001
From: Prabhakar Kushwaha <prabhakar@freescale.com>
Date: Thu, 13 Sep 2012 13:34:11 +0530
Subject: [PATCH] --- yaml --- r: 330374 b: refs/heads/master c:
 721c0705906e2ba69907fd2ca837bec6b6a8dbcb h: refs/heads/master v: v3

---
 [refs]                              |  2 +-
 trunk/arch/powerpc/sysdev/fsl_ifc.c | 20 ++++++++------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index fb3f17a3fe24..09198a408103 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1919aac36c2472ad010102661d5aa6d55f0d66a4
+refs/heads/master: 721c0705906e2ba69907fd2ca837bec6b6a8dbcb
diff --git a/trunk/arch/powerpc/sysdev/fsl_ifc.c b/trunk/arch/powerpc/sysdev/fsl_ifc.c
index b31f19f61031..097cc9d2585b 100644
--- a/trunk/arch/powerpc/sysdev/fsl_ifc.c
+++ b/trunk/arch/powerpc/sysdev/fsl_ifc.c
@@ -244,12 +244,6 @@ static int __devinit fsl_ifc_ctrl_probe(struct platform_device *dev)
 	/* get the nand machine irq */
 	fsl_ifc_ctrl_dev->nand_irq =
 			irq_of_parse_and_map(dev->dev.of_node, 1);
-	if (fsl_ifc_ctrl_dev->nand_irq == NO_IRQ) {
-		dev_err(&dev->dev, "failed to get irq resource "
-						"for NAND Machine\n");
-		ret = -ENODEV;
-		goto err;
-	}
 
 	fsl_ifc_ctrl_dev->dev = &dev->dev;
 
@@ -267,12 +261,14 @@ static int __devinit fsl_ifc_ctrl_probe(struct platform_device *dev)
 		goto err_irq;
 	}
 
-	ret = request_irq(fsl_ifc_ctrl_dev->nand_irq, fsl_ifc_nand_irq, 0,
-			  "fsl-ifc-nand", fsl_ifc_ctrl_dev);
-	if (ret != 0) {
-		dev_err(&dev->dev, "failed to install irq (%d)\n",
-			fsl_ifc_ctrl_dev->nand_irq);
-		goto err_nandirq;
+	if (fsl_ifc_ctrl_dev->nand_irq) {
+		ret = request_irq(fsl_ifc_ctrl_dev->nand_irq, fsl_ifc_nand_irq,
+				0, "fsl-ifc-nand", fsl_ifc_ctrl_dev);
+		if (ret != 0) {
+			dev_err(&dev->dev, "failed to install irq (%d)\n",
+				fsl_ifc_ctrl_dev->nand_irq);
+			goto err_nandirq;
+		}
 	}
 
 	return 0;