Merge branch 'acpi-ec'

[linux-drm-fsl-dcu.git] / arch / microblaze / kernel / intc.c

diff --git a/arch/microblaze/kernel/intc.c b/arch/microblaze/kernel/intc.c
index 15c7c12ea0e777183c321872c57c8e0a335bc3df..719feee1e043be1625a01d9ad587bd6a719ee0fe 100644 (file)
--- a/arch/microblaze/kernel/intc.c
+++ b/arch/microblaze/kernel/intc.c
@@ -148,17 +148,17 @@ 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))
-               pr_info(" ERROR: Mismatch in kind-of-intr param\n");
+       if (intr_mask >> nr_irq)
+               pr_warn("%s: mismatch in kind-of-intr param\n", __func__);
 
        pr_info("%s: num_irq=%d, edge=0x%x\n",
                intc->full_name, nr_irq, intr_mask);