drm/amd: consolidate TA shared memory structures

[linux-2.6-microblaze.git] / drivers / cpufreq / sti-cpufreq.c

diff --git a/drivers/cpufreq/sti-cpufreq.c b/drivers/cpufreq/sti-cpufreq.c
index 4ac6fb2..fdb0a72 100644 (file)
--- a/drivers/cpufreq/sti-cpufreq.c
+++ b/drivers/cpufreq/sti-cpufreq.c
@@ -223,7 +223,8 @@ use_defaults:
        opp_table = dev_pm_opp_set_supported_hw(dev, version, VERSION_ELEMENTS);
        if (IS_ERR(opp_table)) {
                dev_err(dev, "Failed to set supported hardware\n");
-               return PTR_ERR(opp_table);
+               ret = PTR_ERR(opp_table);
+               goto err_put_prop_name;
        }
 
        dev_dbg(dev, "pcode: %d major: %d minor: %d substrate: %d\n",
@@ -232,6 +233,10 @@ use_defaults:
                version[0], version[1], version[2]);
 
        return 0;
+
+err_put_prop_name:
+       dev_pm_opp_put_prop_name(opp_table);
+       return ret;
 }
 
 static int sti_cpufreq_fetch_syscon_registers(void)
@@ -292,6 +297,13 @@ register_cpufreq_dt:
 }
 module_init(sti_cpufreq_init);
 
+static const struct of_device_id __maybe_unused sti_cpufreq_of_match[] = {
+       { .compatible = "st,stih407" },
+       { .compatible = "st,stih410" },
+       { },
+};
+MODULE_DEVICE_TABLE(of, sti_cpufreq_of_match);
+
 MODULE_DESCRIPTION("STMicroelectronics CPUFreq/OPP driver");
 MODULE_AUTHOR("Ajitpal Singh <ajitpal.singh@st.com>");
 MODULE_AUTHOR("Lee Jones <lee.jones@linaro.org>");