Re: [PATCH 1/3] microblaze: intc: Don't override error codes

From: Michal Simek
Date: Mon Jan 05 2015 - 06:56:49 EST


On 12/19/2014 07:21 PM, Soren Brinkmann wrote:
> Just pass on error codes instead of overriding them.
>
> Signed-off-by: Soren Brinkmann <soren.brinkmann@xxxxxxxxxx>
> ---
> arch/microblaze/kernel/intc.c | 4 ++--
> 1 file 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,
> 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))
>

Applied all.

Thanks,
Michal
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/