X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=drivers%2Fclk%2Fclk.c;h=2db08c01ef51d9de9b618282ba55134d97dfabe4;hb=7f7ed584d11be77a7521d170431bb14bc32a5980;hp=7c4376289865ee587f6ac3ea3d2b1866a6b10f52;hpb=1ec5502ef20acc0af5c9172aac4652cd7cafd852;p=~andy%2Flinux

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 7c437628986..2db08c01ef5 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -2228,13 +2228,13 @@ EXPORT_SYMBOL_GPL(of_clk_get_parent_name);
  */
 void __init of_clk_init(const struct of_device_id *matches)
 {
+	const struct of_device_id *match;
 	struct device_node *np;
 
 	if (!matches)
 		matches = __clk_of_table;
 
-	for_each_matching_node(np, matches) {
-		const struct of_device_id *match = of_match_node(matches, np);
+	for_each_matching_node_and_match(np, matches, &match) {
 		of_clk_init_cb_t clk_init_cb = match->data;
 		clk_init_cb(np);
 	}