summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSoren Brinkmann <soren.brinkmann@xilinx.com>2014-12-19 10:21:04 -0800
committerMichal Simek <michal.simek@xilinx.com>2015-01-08 08:37:22 +0100
commit2c80a072a6c1cc4490fbbde5ba82bc7faf0374f0 (patch)
treec895e39d4b0d61f98523eedfcd74cc059815e324
parented89466f2368fc15c72ce5344d582c640dcf53a6 (diff)
downloadop-kernel-dev-2c80a072a6c1cc4490fbbde5ba82bc7faf0374f0.zip
op-kernel-dev-2c80a072a6c1cc4490fbbde5ba82bc7faf0374f0.tar.gz
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>
-rw-r--r--arch/microblaze/kernel/intc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/microblaze/kernel/intc.c b/arch/microblaze/kernel/intc.c
index 15c7c12..01ae730 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))
OpenPOWER on IntegriCloud