Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

of: irq: fix return when no match found in irqdomain map

Browse source 
Return an error value (currently returning 0) when a match for an
interrupt in the irqdomain map is not found.

Change-Id: I618fd5d6bf0ecbd84cdda74f469514ca7bc55667
Fixes: 0303182e48 ("of: irq: add helper to remap interrupts to another irqdomain")
Signed-off-by: Lina Iyer <ilina@codeaurora.org>
This commit is contained in:
Lina Iyer 2019-03-21 15:41:12 -06:00
parent a0ea5cbbc1
commit 8e71a328a7
1 changed files with 28 additions and 24 deletions

52
drivers/of/irq.c
View file

@ -361,32 +361,36 @@ int of_irq_domain_map(const struct irq_fwspec *in, struct irq_fwspec *out)
map += out_size;
map_len -= out_size;
}
if (match) {
/* Get the irqdomain-map-pass-thru property (optional) */
pass = of_get_property(cur, pass_name, NULL);
if (!pass)
pass = dummy_pass;
/*
* Successfully parsed a irqdomain-map translation; copy new
* specifier into the out structure, keeping the
* bits specified in irqdomain-map-pass-thru.
*/
match_array = map - out_size;
for (i = 0; i < out_size; i++) {
__be32 val = *(map - out_size + i);
out->param[i] = in->param[i];
if (i < in_size) {
val &= ~pass[i];
val |= cpu_to_be32(out->param[i]) & pass[i];
}
out->param[i] = be32_to_cpu(val);
}
out->param_count = in_size = out_size;
out->fwnode = of_node_to_fwnode(new);
if (!match) {
ret = -EINVAL;
goto put;
}
/* Get the irqdomain-map-pass-thru property (optional) */
pass = of_get_property(cur, pass_name, NULL);
if (!pass)
pass = dummy_pass;
/*
* Successfully parsed a irqdomain-map translation; copy new
* specifier into the out structure, keeping the
* bits specified in irqdomain-map-pass-thru.
*/
match_array = map - out_size;
for (i = 0; i < out_size; i++) {
__be32 val = *(map - out_size + i);
out->param[i] = in->param[i];
if (i < in_size) {
val &= ~pass[i];
val |= cpu_to_be32(out->param[i]) & pass[i];
}
out->param[i] = be32_to_cpu(val);
}
out->param_count = in_size = out_size;
out->fwnode = of_node_to_fwnode(new);
put:
of_node_put(cur);
of_node_put(new);