Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c80a072 authored by Soren Brinkmann's avatar Soren Brinkmann Committed by Michal Simek
Browse files

microblaze: intc: Don't override error codes 



Just pass on error codes instead of overriding them.

Signed-off-by: default avatarSoren Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
parent ed89466f

arch/microblaze/kernel/intc.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -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);

	ret = of_property_read_u32(intc, "xlnx,num-intr-inputs", &nr_irq);

	if (ret < 0) {

	if (ret < 0) {

		pr_err("%s: unable to read xlnx,num-intr-inputs\n", __func__);

		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);

	ret = of_property_read_u32(intc, "xlnx,kind-of-intr", &intr_mask);

	if (ret < 0) {

	if (ret < 0) {

		pr_err("%s: unable to read xlnx,kind-of-intr\n", __func__);

		pr_err("%s: unable to read xlnx,kind-of-intr\n", __func__);

		return -EINVAL;

		return ret;

	}

	}





	if (intr_mask > (u32)((1ULL << nr_irq) - 1))

	if (intr_mask > (u32)((1ULL << nr_irq) - 1))