From: Soren Brinkmann <soren.brinkmann@xilinx.com>
Date: Fri, 19 Dec 2014 18:21:04 +0000 (-0800)
Subject: microblaze: intc: Don't override error codes
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=2c80a072a6c1cc4490fbbde5ba82bc7faf0374f0;p=deliverable%2Flinux.git

microblaze: intc: Don't override error codes

Just pass on error codes instead of overriding them.

Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/arch/microblaze/kernel/intc.c b/arch/microblaze/kernel/intc.c
index 15c7c12ea0e7..01ae73088578 100644
--- a/arch/microblaze/kernel/intc.c
+++ b/arch/microblaze/kernel/intc.c
@@ -148,13 +148,13 @@ static int __init xilinx_intc_of_init(struct device_node *intc,
 	ret = of_property_read_u32(intc, "xlnx,num-intr-inputs", &nr_irq);
 	if (ret < 0) {
 		pr_err("%s: unable to read xlnx,num-intr-inputs\n", __func__);
-		return -EINVAL;
+		return ret;
 	}
 
 	ret = of_property_read_u32(intc, "xlnx,kind-of-intr", &intr_mask);
 	if (ret < 0) {
 		pr_err("%s: unable to read xlnx,kind-of-intr\n", __func__);
-		return -EINVAL;
+		return ret;
 	}
 
 	if (intr_mask > (u32)((1ULL << nr_irq) - 1))