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

Commit e1e29bbc authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "genirq: Respect IRQCHIP_SKIP_SET_WAKE in irq_chip_set_wake_parent()"

parents b19f8132 2c274e13

drivers/of/irq.c

+26 −22
Original line number Diff line number Diff line
@@ -361,7 +361,12 @@ int of_irq_domain_map(const struct irq_fwspec *in, struct irq_fwspec *out) 
		map += out_size;

		map_len -= out_size;

	}

	if (match) {



	if (!match) {

		ret = -EINVAL;

		goto put;

	}



	/* Get the irqdomain-map-pass-thru property (optional) */

	pass = of_get_property(cur, pass_name, NULL);

	if (!pass)
@@ -386,7 +391,6 @@ int of_irq_domain_map(const struct irq_fwspec *in, struct irq_fwspec *out) 
	}

	out->param_count = in_size = out_size;

	out->fwnode = of_node_to_fwnode(new);

	}

put:

	of_node_put(cur);

	of_node_put(new);

kernel/irq/chip.c

+4 −0
Original line number Diff line number Diff line
@@ -1376,6 +1376,10 @@ int irq_chip_set_vcpu_affinity_parent(struct irq_data *data, void *vcpu_info) 
int irq_chip_set_wake_parent(struct irq_data *data, unsigned int on)

{

	data = data->parent_data;



	if (data->chip->flags & IRQCHIP_SKIP_SET_WAKE)

		return 0;



	if (data->chip->irq_set_wake)

		return data->chip->irq_set_wake(data, on);