Re: [patch 17/75] genirq: Consolidate IRQ_DISABLED

[Lars-Peter Clausen]

On 02/11/2011 12:36 AM, Thomas Gleixner wrote:
> Index: linux-2.6-tip/kernel/irq/chip.c
> ===================================================================
> --- linux-2.6-tip.orig/kernel/irq/chip.c
> +++ linux-2.6-tip/kernel/irq/chip.c
> @@ -192,11 +192,14 @@ EXPORT_SYMBOL_GPL(set_irq_nested_thread)
>
>  int irq_startup(struct irq_desc *desc)
>  {
> -	desc->status &= ~(IRQ_MASKED | IRQ_DISABLED);
> +	desc->status &= ~IRQ_DISABLED;
>  	desc->depth = 0;
>
> -	if (desc->irq_data.chip->irq_startup)
> -		return desc->irq_data.chip->irq_startup(&desc->irq_data);
> +	if (desc->irq_data.chip->irq_startup) {
> +		int ret = desc->irq_data.chip->irq_startup(&desc->irq_data);
> +		desc->status &= IRQ_MASKED;

Although it is fixed in patch 45 of this series, I guess it should rather be
desc->status &= ~IRQ_MASKED here too.

> +		return ret;
> +	}
--
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/