Merge tag 'omap-for-v5.5/dt-fixes-merge-window-signed' of git://git.kernel.org/pub...

[linux.git] / kernel / sched / topology.c

diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c
index 49b835f1305f8c1cfe659bb466a00c4b71767185..6ec1e595b1d428445d5818871f5576334930c2fa 100644 (file)
--- a/kernel/sched/topology.c
+++ b/kernel/sched/topology.c
@@ -1201,16 +1201,13 @@ static void set_domain_attribute(struct sched_domain *sd,
        if (!attr || attr->relax_domain_level < 0) {
                if (default_relax_domain_level < 0)
                        return;
-               else
-                       request = default_relax_domain_level;
+               request = default_relax_domain_level;
        } else
                request = attr->relax_domain_level;
-       if (request < sd->level) {
+
+       if (sd->level > request) {
                /* Turn off idle balance on this domain: */
                sd->flags &= ~(SD_BALANCE_WAKE|SD_BALANCE_NEWIDLE);
-       } else {
-               /* Turn on idle balance on this domain: */
-               sd->flags |= (SD_BALANCE_WAKE|SD_BALANCE_NEWIDLE);
        }
 }