Merge tag 'drivers-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / drivers / bus / mvebu-mbus.c

diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c
index 2ac754e18bcf1af6a285c5de9f6df867f4e83298..293e2e0a0a87c7d9877c27524fd98503ba16c1cf 100644 (file)
--- a/drivers/bus/mvebu-mbus.c
+++ b/drivers/bus/mvebu-mbus.c
@@ -890,13 +890,12 @@ int __init mvebu_mbus_dt_init(void)
        const __be32 *prop;
        int ret;
 
-       np = of_find_matching_node(NULL, of_mvebu_mbus_ids);
+       np = of_find_matching_node_and_match(NULL, of_mvebu_mbus_ids, &of_id);
        if (!np) {
                pr_err("could not find a matching SoC family\n");
                return -ENODEV;
        }
 
-       of_id = of_match_node(of_mvebu_mbus_ids, np);
        mbus_state.soc = of_id->data;
 
        prop = of_get_property(np, "controller", NULL);