Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112...

[mirror_ubuntu-artful-kernel.git] / drivers / cpufreq / sti-cpufreq.c

diff --git a/drivers/cpufreq/sti-cpufreq.c b/drivers/cpufreq/sti-cpufreq.c
index b366e6d830ea30d4bef9e823defa5bf82047af82..a7db9011d5fec57fbf71849fce133a37f88d4a94 100644 (file)
--- a/drivers/cpufreq/sti-cpufreq.c
+++ b/drivers/cpufreq/sti-cpufreq.c
@@ -160,6 +160,7 @@ static int sti_cpufreq_set_opp_info(void)
        int pcode, substrate, major, minor;
        int ret;
        char name[MAX_PCODE_NAME_LEN];
+       struct opp_table *opp_table;
 
        reg_fields = sti_cpufreq_match();
        if (!reg_fields) {
@@ -211,20 +212,20 @@ use_defaults:
 
        snprintf(name, MAX_PCODE_NAME_LEN, "pcode%d", pcode);
 
-       ret = dev_pm_opp_set_prop_name(dev, name);
-       if (ret) {
+       opp_table = dev_pm_opp_set_prop_name(dev, name);
+       if (IS_ERR(opp_table)) {
                dev_err(dev, "Failed to set prop name\n");
-               return ret;
+               return PTR_ERR(opp_table);
        }
 
        version[0] = BIT(major);
        version[1] = BIT(minor);
        version[2] = BIT(substrate);
 
-       ret = dev_pm_opp_set_supported_hw(dev, version, VERSION_ELEMENTS);
-       if (ret) {
+       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 ret;
+               return PTR_ERR(opp_table);
        }
 
        dev_dbg(dev, "pcode: %d major: %d minor: %d substrate: %d\n",