Merge branch 'parisc-4.6-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[deliverable/linux.git] / drivers / clk / clk-palmas.c

diff --git a/drivers/clk/clk-palmas.c b/drivers/clk/clk-palmas.c
index c55e7745c9f8d45a78cc1a03f9eb2485c4e5c1ed..9c0b8e6b1ab322b13aaef11ddb451c1b84ecffc9 100644 (file)
--- a/drivers/clk/clk-palmas.c
+++ b/drivers/clk/clk-palmas.c
@@ -241,13 +241,13 @@ static int palmas_clks_probe(struct platform_device *pdev)
        struct palmas *palmas = dev_get_drvdata(pdev->dev.parent);
        struct device_node *node = pdev->dev.of_node;
        const struct palmas_clks_of_match_data *match_data;
-       const struct of_device_id *match;
        struct palmas_clock_info *cinfo;
        struct clk *clk;
        int ret;
 
-       match = of_match_device(palmas_clks_of_match, &pdev->dev);
-       match_data = match->data;
+       match_data = of_device_get_match_data(&pdev->dev);
+       if (!match_data)
+               return 1;
 
        cinfo = devm_kzalloc(&pdev->dev, sizeof(*cinfo), GFP_KERNEL);
        if (!cinfo)