Skip to content

Commit c3028b9

Browse files
Nicolas Saenz Juliennetsbogend
authored andcommitted
of: address: Fix parser address/size cells initialization
bus->count_cells() parses cells starting from the node's parent. This is not good enough for parser_init() which is generally parsing a bus node. Revert to previous behavior using of_bus_n_*_cells(). Fixes: 2f96593 ("of_address: Add bus type match for pci ranges parser") Reported-by: Nathan Chancellor <[email protected]> Signed-off-by: Nicolas Saenz Julienne <[email protected]> Acked-by: Rob Herring <[email protected]> Signed-off-by: Thomas Bogendoerfer <[email protected]>
1 parent 0fc0ead commit c3028b9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/of/address.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -701,11 +701,11 @@ static int parser_init(struct of_pci_range_parser *parser,
701701

702702
parser->node = node;
703703
parser->pna = of_n_addr_cells(node);
704+
parser->na = of_bus_n_addr_cells(node);
705+
parser->ns = of_bus_n_size_cells(node);
704706
parser->dma = !strcmp(name, "dma-ranges");
705707
parser->bus = of_match_bus(node);
706708

707-
parser->bus->count_cells(parser->node, &parser->na, &parser->ns);
708-
709709
parser->range = of_get_property(node, name, &rlen);
710710
if (parser->range == NULL)
711711
return -ENOENT;

0 commit comments

Comments
 (0)