diff options
author | Soren Brinkmann <soren.brinkmann@xilinx.com> | 2014-12-19 13:21:04 -0500 |
---|---|---|
committer | Michal Simek <michal.simek@xilinx.com> | 2015-01-08 02:37:22 -0500 |
commit | 2c80a072a6c1cc4490fbbde5ba82bc7faf0374f0 (patch) | |
tree | c895e39d4b0d61f98523eedfcd74cc059815e324 | |
parent | ed89466f2368fc15c72ce5344d582c640dcf53a6 (diff) |
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.c | 4 |
1 files changed, 2 insertions, 2 deletions
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, | |||
148 | ret = of_property_read_u32(intc, "xlnx,num-intr-inputs", &nr_irq); | 148 | ret = of_property_read_u32(intc, "xlnx,num-intr-inputs", &nr_irq); |
149 | if (ret < 0) { | 149 | if (ret < 0) { |
150 | pr_err("%s: unable to read xlnx,num-intr-inputs\n", __func__); | 150 | pr_err("%s: unable to read xlnx,num-intr-inputs\n", __func__); |
151 | return -EINVAL; | 151 | return ret; |
152 | } | 152 | } |
153 | 153 | ||
154 | ret = of_property_read_u32(intc, "xlnx,kind-of-intr", &intr_mask); | 154 | ret = of_property_read_u32(intc, "xlnx,kind-of-intr", &intr_mask); |
155 | if (ret < 0) { | 155 | if (ret < 0) { |
156 | pr_err("%s: unable to read xlnx,kind-of-intr\n", __func__); | 156 | pr_err("%s: unable to read xlnx,kind-of-intr\n", __func__); |
157 | return -EINVAL; | 157 | return ret; |
158 | } | 158 | } |
159 | 159 | ||
160 | if (intr_mask > (u32)((1ULL << nr_irq) - 1)) | 160 | if (intr_mask > (u32)((1ULL << nr_irq) - 1)) |